From 3299f7e726f7a9b18646de1fc1a05848374ba91b Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Fri, 24 Apr 2015 15:20:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E5=BA=93issue=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 484a3189c..fed074bdb 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -329,7 +329,7 @@ module ApplicationHelper imagesize = attachment.thumbnail(:size => "50*50") imagepath = named_attachment_path(attachment, attachment.filename) if imagesize - link_to image_tag(imagesize), + link_to image_tag(thumbnail_path(attachment,"50")), imagepath, :title => attachment.filename else From 449bbc553cfe7a62cdf21ce2e10c1100f48ededa Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Fri, 24 Apr 2015 15:20:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dissue=E7=95=8C=E9=9D=A2js?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/repositories_helper.rb | 6 +++++- app/views/issues/_form.html.erb | 5 ++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index 3c7123435..773560932 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -18,7 +18,11 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. module RepositoriesHelper - ROOT_PATH="/home/pdl/redmine-2.3.2-0/apache2/" + if Rails.env.development? + ROOT_PATH="/tmp/" if Rails.env.development? + else + ROOT_PATH="/home/pdl/redmine-2.3.2-0/apache2/" + end PROJECT_PATH_CUT = 40 REPO_IP_ADDRESS = Setting.repository_domain diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb index 5679c92d4..f0e28a975 100644 --- a/app/views/issues/_form.html.erb +++ b/app/views/issues/_form.html.erb @@ -38,8 +38,7 @@ <%= javascript_tag do %> observeAutocompleteField('issue_subject', - '<%= escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (Setting.cross_project_issue_relations? ? 'all' : nil)) %> - ', + '<%= escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (Setting.cross_project_issue_relations? ? 'all' : nil)) %>', { select: function(event, ui) { $('input#issue_subject').val(ui.item.value); } @@ -113,4 +112,4 @@ <%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %> -<% end %> \ No newline at end of file +<% end %> From 338a7d3dedafa47d9cf587e0055453d02c73627f Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 24 Apr 2015 16:05:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=8E=BB=E6=8E=89code=20?= =?UTF-8?q?icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/kindeditor/kindeditor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index 7d74752f1..ea6a5b1c7 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -257,7 +257,7 @@ K.options = { minHeight : 100, minChangeSize : 50, zIndex : 811213, - items : [ 'emoticons','code', + items : [ 'emoticons', 'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|', 'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold', 'italic', 'underline', 'removeformat', '|','imagedirectupload','table', 'link'