#1659 fix change label title resets color

release/v1.15
Unknwon 2015-09-18 06:18:31 -04:00
parent 86d3c5cbb3
commit d9c5b3bcee
4 changed files with 4 additions and 2 deletions

View File

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)
const APP_VER = "0.6.13.0917 Beta"
const APP_VER = "0.6.13.0918 Beta"
func init() {
runtime.GOMAXPROCS(runtime.NumCPU())

View File

@ -238,6 +238,7 @@ function initRepository() {
$('.edit-label-button').click(function () {
$('#label-modal-id').val($(this).data('id'));
$('.edit-label .new-label-input').val($(this).data('title'));
$('.edit-label .color-picker').val($(this).data('color'));
$('.minicolors-swatch-color').css("background-color", $(this).data('color'));
$('.edit-label.modal').modal({
onApprove: function () {

View File

@ -904,6 +904,7 @@ func UpdateLabel(ctx *middleware.Context, form auth.CreateLabelForm) {
return
}
fmt.Println(form.Title, form.Color)
l.Name = form.Title
l.Color = form.Color
if err := models.UpdateLabel(l); err != nil {

View File

@ -1 +1 @@
0.6.13.0917 Beta
0.6.13.0918 Beta