From d9c5b3bceef42f269e16c6d2f2b4a4ad29f7882d Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Fri, 18 Sep 2015 06:18:31 -0400
Subject: [PATCH] #1659 fix change label title resets color
---
gogs.go | 2 +-
public/js/gogs.js | 1 +
routers/repo/issue.go | 1 +
templates/.VERSION | 2 +-
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/gogs.go b/gogs.go
index e2b32d0df..0bca6e580 100644
--- a/gogs.go
+++ b/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())
diff --git a/public/js/gogs.js b/public/js/gogs.js
index 59cdf5d66..d38e8976f 100644
--- a/public/js/gogs.js
+++ b/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 () {
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index cc344bd08..6912a2faf 100644
--- a/routers/repo/issue.go
+++ b/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 {
diff --git a/templates/.VERSION b/templates/.VERSION
index 238023654..969aae1e3 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.6.13.0917 Beta
\ No newline at end of file
+0.6.13.0918 Beta
\ No newline at end of file