From 538c64329f16f0be5a6246d4b2021d7d3bd5da1f Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 21 Dec 2015 09:26:56 +0800 Subject: [PATCH 1/6] =?UTF-8?q?issue=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/update.js.erb | 17 +++++++++++++++-- .../app/views/issues/update_form.js.erb | 11 ++++++----- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/app/views/issues/update.js.erb b/app/views/issues/update.js.erb index be018c3f5..ede4a0534 100644 --- a/app/views/issues/update.js.erb +++ b/app/views/issues/update.js.erb @@ -12,12 +12,25 @@ issue_desc_editor = KindEditor.create('#issue_description', {"width":"85%", "resizeType":0, "no_label":true, + "at_id":<%= @issue.project_id%>, + "at_type":"Project", "autoHeightMode":true, - "afterCreate":"eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);} if(typeof enableAt ==='function'){enableAt(self);} this.loadPlugin(\"autoheight\")})", - "emotionsBasePath":"http://localhost:3000","height":300, + "afterCreate":"eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);};if(typeof enableAt ==='function'){enableAt(self, \"<%=@issue.project_id %>\", 'Project');}; this.loadPlugin('autoheight')})", + "emotionsBasePath":'<%= Setting.host_name%>', + "height":300, "allowFileManager":true, "uploadJson":"/kindeditor/upload", "fileManagerJson":"/kindeditor/filemanager"}); +//issue_desc_editor = KindEditor.create('#issue_description', +// {"width":"85%", +// "resizeType":0, +// "no_label":true, +// "autoHeightMode":true, +// "afterCreate":"eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);} if(typeof enableAt ==='function'){enableAt(self);} this.loadPlugin(\"autoheight\")})", +// "emotionsBasePath":"http://localhost:3000","height":300, +// "allowFileManager":true, +// "uploadJson":"/kindeditor/upload", +// "fileManagerJson":"/kindeditor/filemanager"}); <%else%> alert('<%= @issue.errors.full_messages[0].to_s%>') <%end %> diff --git a/plugins/redmine_ckeditor/app/views/issues/update_form.js.erb b/plugins/redmine_ckeditor/app/views/issues/update_form.js.erb index 23bd5108b..3b93de0b3 100644 --- a/plugins/redmine_ckeditor/app/views/issues/update_form.js.erb +++ b/plugins/redmine_ckeditor/app/views/issues/update_form.js.erb @@ -13,11 +13,12 @@ issue_desc_editor = KindEditor.create('#issue_description', {"width":"85%", "resizeType":0, "no_label":true, + "at_id":<%= @issue.project_id%>, + "at_type":"Project", "autoHeightMode":true, - "afterCreate":"eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);} if(typeof enableAt ==='function'){enableAt(self);} this.loadPlugin(\"autoheight\"),$(this.toolbar.div).hide();})", - "afterFocus":"eval(function(){$(this.toolbar.div).show();})", - "afterBlur":"eval(function(){$(this.toolbar.div).hide();})", - "emotionsBasePath":"http://localhost:3000", - "height":300,"allowFileManager":true, + "afterCreate":"eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);};if(typeof enableAt ==='function'){enableAt(self, "<%=@issue.project_id %>", 'Project');}; this.loadPlugin('autoheight')})", + "emotionsBasePath":'<%= Setting.host_name%>', + "height":300, + "allowFileManager":true, "uploadJson":"/kindeditor/upload", "fileManagerJson":"/kindeditor/filemanager"}); \ No newline at end of file From e86f9f9aeb8469d3b1854679bedfeae180b88808 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 21 Dec 2015 13:20:09 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=AD=97=E7=AC=A6=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/course.js | 4 ++-- public/javascripts/project.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/javascripts/course.js b/public/javascripts/course.js index c147850ef..5bfaccf30 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -299,12 +299,12 @@ function regexDescription() $("#description_notice_span").focus(); return false; } - else if(name.length >=6000){ + /*else if(name.length >=6000){ $("#description_notice_span").text("描述最多3000个汉字(或6000个英文字符)"); $("#description_notice_span").css('color','#ff0000'); $("#description_notice_span").focus(); return false; - } + }*/ else { $("#description_notice_span").text("填写正确"); diff --git a/public/javascripts/project.js b/public/javascripts/project.js index a7bf954a0..cc679847a 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -248,13 +248,13 @@ function regexDescription() { $("#description_notice_span").focus(); return false; } - else if (name.length > 10000) + /*else if (name.length > 10000) { $("#description_notice_span").text("描述超过10000个字符"); $("#description_notice_span").css('color', '#ff0000'); $("#description_notice_span").focus(); return false; - } + }*/ else { $("#description_notice_span").text("填写正确"); $("#description_notice_span").css('color', '#008000'); From 3de4c7129ad2ae5751e061a532446799e402b7e2 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Dec 2015 13:48:25 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/repository.rb | 2 +- lib/redmine/scm/adapters/abstract_adapter.rb | 2 +- lib/redmine/scm/adapters/gitlab_adapter.rb | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index f50f37f31..571bba1b9 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -107,7 +107,7 @@ class Repository < ActiveRecord::Base def scm unless @scm @scm = self.scm_adapter.new(url, root_url, - login, password, path_encoding) + login, password, path_encoding, project_id) if root_url.blank? && @scm.root_url.present? update_attribute(:root_url, @scm.root_url) end diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb index 3e51f2d4d..2dd520b92 100644 --- a/lib/redmine/scm/adapters/abstract_adapter.rb +++ b/lib/redmine/scm/adapters/abstract_adapter.rb @@ -80,7 +80,7 @@ module Redmine end def initialize(url, root_url=nil, login=nil, password=nil, - path_encoding=nil) + path_encoding=nil, project_id) @url = url @login = login if login && !login.empty? @password = (password || "") if @login diff --git a/lib/redmine/scm/adapters/gitlab_adapter.rb b/lib/redmine/scm/adapters/gitlab_adapter.rb index 32429fe35..7b2d18310 100644 --- a/lib/redmine/scm/adapters/gitlab_adapter.rb +++ b/lib/redmine/scm/adapters/gitlab_adapter.rb @@ -13,10 +13,12 @@ module Redmine attr_accessor :is_default end - def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil) + def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil, project_id) super @g = Gitlab.client - @project = Repository.find_by_url(url).project.gpid + r = Repository.where("url =? and project_id =?", url, project_id).first + @project = r.project.gpid + # @project = Repository.find_by_url(url).project.gpid @path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding end From ab1397d98274b624db14c3b653b2c94ba287fbfd Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Dec 2015 13:53:22 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/repository.rb | 2 +- lib/redmine/scm/adapters/abstract_adapter.rb | 2 +- lib/redmine/scm/adapters/gitlab_adapter.rb | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index 571bba1b9..f50f37f31 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -107,7 +107,7 @@ class Repository < ActiveRecord::Base def scm unless @scm @scm = self.scm_adapter.new(url, root_url, - login, password, path_encoding, project_id) + login, password, path_encoding) if root_url.blank? && @scm.root_url.present? update_attribute(:root_url, @scm.root_url) end diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb index 2dd520b92..3e51f2d4d 100644 --- a/lib/redmine/scm/adapters/abstract_adapter.rb +++ b/lib/redmine/scm/adapters/abstract_adapter.rb @@ -80,7 +80,7 @@ module Redmine end def initialize(url, root_url=nil, login=nil, password=nil, - path_encoding=nil, project_id) + path_encoding=nil) @url = url @login = login if login && !login.empty? @password = (password || "") if @login diff --git a/lib/redmine/scm/adapters/gitlab_adapter.rb b/lib/redmine/scm/adapters/gitlab_adapter.rb index 7b2d18310..32429fe35 100644 --- a/lib/redmine/scm/adapters/gitlab_adapter.rb +++ b/lib/redmine/scm/adapters/gitlab_adapter.rb @@ -13,12 +13,10 @@ module Redmine attr_accessor :is_default end - def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil, project_id) + def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil) super @g = Gitlab.client - r = Repository.where("url =? and project_id =?", url, project_id).first - @project = r.project.gpid - # @project = Repository.find_by_url(url).project.gpid + @project = Repository.find_by_url(url).project.gpid @path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding end From c381ce177f2b1dff4ddde70e123418a93595ff4b Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Dec 2015 14:00:09 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=A4=AA=E9=95=BF=E4=B8=8D=E8=83=BD=E5=8F=91=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/news.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/news.rb b/app/models/news.rb index 53581a536..a7407c91f 100644 --- a/app/models/news.rb +++ b/app/models/news.rb @@ -41,7 +41,7 @@ class News < ActiveRecord::Base validates_presence_of :title, :description validates_length_of :title, :maximum => 60 validates_length_of :summary, :maximum => 255 - validates_length_of :description, :maximum => 10000 + # validates_length_of :description, :maximum => 10000 acts_as_attachable :delete_permission => :manage_news acts_as_searchable :columns => ['title', 'summary', "#{table_name}.description"], :include => :project From 1a549eda4667a12a0019c760519474c54a73110c Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Dec 2015 14:33:28 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/repository.rb | 2 +- lib/redmine/scm/adapters/abstract_adapter.rb | 2 +- lib/redmine/scm/adapters/gitlab_adapter.rb | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index f50f37f31..571bba1b9 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -107,7 +107,7 @@ class Repository < ActiveRecord::Base def scm unless @scm @scm = self.scm_adapter.new(url, root_url, - login, password, path_encoding) + login, password, path_encoding, project_id) if root_url.blank? && @scm.root_url.present? update_attribute(:root_url, @scm.root_url) end diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb index 3e51f2d4d..2dd520b92 100644 --- a/lib/redmine/scm/adapters/abstract_adapter.rb +++ b/lib/redmine/scm/adapters/abstract_adapter.rb @@ -80,7 +80,7 @@ module Redmine end def initialize(url, root_url=nil, login=nil, password=nil, - path_encoding=nil) + path_encoding=nil, project_id) @url = url @login = login if login && !login.empty? @password = (password || "") if @login diff --git a/lib/redmine/scm/adapters/gitlab_adapter.rb b/lib/redmine/scm/adapters/gitlab_adapter.rb index 32429fe35..7b2d18310 100644 --- a/lib/redmine/scm/adapters/gitlab_adapter.rb +++ b/lib/redmine/scm/adapters/gitlab_adapter.rb @@ -13,10 +13,12 @@ module Redmine attr_accessor :is_default end - def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil) + def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil, project_id) super @g = Gitlab.client - @project = Repository.find_by_url(url).project.gpid + r = Repository.where("url =? and project_id =?", url, project_id).first + @project = r.project.gpid + # @project = Repository.find_by_url(url).project.gpid @path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding end