Browse Source

#1659 fix change label title resets color

Unknwon 9 years ago
parent
commit
d9c5b3bcee
4 changed files with 4 additions and 2 deletions
  1. 1 1
      gogs.go
  2. 1 0
      public/js/gogs.js
  3. 1 0
      routers/repo/issue.go
  4. 1 1
      templates/.VERSION

+ 1 - 1
gogs.go

@@ -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())

+ 1 - 0
public/js/gogs.js

@@ -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 () {

+ 1 - 0
routers/repo/issue.go

@@ -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 {

+ 1 - 1
templates/.VERSION

@@ -1 +1 @@
-0.6.13.0917 Beta
+0.6.13.0918 Beta