From b5d9cf55fff6354252b45000ffbf9714f750f73c Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 22 May 2015 15:59:37 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=B0=86=E5=9F=9F=E5=90=8D=E9=85=8D?=
=?UTF-8?q?=E7=BD=AE=E5=8A=A0=E5=85=A5=E5=88=B0=E7=AE=A1=E7=90=86=E5=91=98?=
=?UTF-8?q?=E5=90=8E=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/settings/_general.html.erb | 5 +++++
config/locales/en.yml | 4 ++++
config/locales/zh.yml | 4 ++++
3 files changed, 13 insertions(+)
diff --git a/app/views/settings/_general.html.erb b/app/views/settings/_general.html.erb
index 763b65515..fdb3c6f85 100644
--- a/app/views/settings/_general.html.erb
+++ b/app/views/settings/_general.html.erb
@@ -15,6 +15,11 @@
<%= setting_text_field :activity_days_default, :size => 6 %> <%= l(:label_day_plural) %>
<%= setting_text_field :host_name, :size => 60 %>
+
<%= setting_text_field :host_course, :size => 60 %>
+
<%= setting_text_field :host_contest, :size => 60 %>
+
<%= setting_text_field :host_user, :size => 60 %>
+
<%= setting_text_field :host_repository, :size => 60 %>
+
<%= l(:label_example) %>: <%= @guessed_host_and_path %>
<%= setting_select :protocol, [['HTTP', 'http'], ['HTTPS', 'https']] %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 844818ae4..09897c1eb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -183,6 +183,10 @@ en:
setting_bcc_recipients: Blind carbon copy recipients (bcc)
setting_plain_text_mail: Plain text mail (no HTML)
setting_host_name: Host name and path
+ setting_host_course: Host course and path
+ setting_host_contest: Host contest and path
+ setting_host_user: Host user and path
+ setting_host_repository: Host repository and path
setting_text_formatting: Text formatting
setting_wiki_compression: Wiki history compression
setting_feeds_limit: Maximum number of items in Atom feeds
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 24702ad46..4c752660a 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -190,6 +190,10 @@ zh:
setting_bcc_recipients: 使用密件抄送 (bcc)
setting_plain_text_mail: 纯文本(无HTML)
setting_host_name: 主机名称
+ setting_host_course: 课程域名
+ setting_host_contest: 竞赛域名
+ setting_host_user: 用户域名
+ setting_host_repository: 仓库域名
setting_text_formatting: 文本格式
setting_wiki_compression: 压缩Wiki历史文档
setting_feeds_limit: RSS Feed内容条数限制
From 052d293f82769541015d8f2935de8c29498d6dde Mon Sep 17 00:00:00 2001
From: huang
Date: Fri, 22 May 2015 16:30:22 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=9A=20=E5=A6=82=E6=9E=9C=E6=88=91?=
=?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E4=B8=AD=E6=9C=89=E9=87=8D=E5=90=8D?=
=?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E4=B8=8D=E5=85=81=E8=AE=B8=E6=96=B0?=
=?UTF-8?q?=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/helpers/projects_helper.rb | 10 ++++++++++
public/javascripts/project.js | 33 ++++++++++++++++++++++++++++++++-
2 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 508e58ba3..12925b0b1 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -65,6 +65,16 @@ module ProjectsHelper
content_tag('div', content, :class => "tabs")
end
+ # 判断我的项目中是否有重名项目
+ def judge_same_projectname(user, project_name)
+ result = false
+ my_projects = user.projects
+ my_projects.each do |mp|
+ result = true if mp.name == project_name
+ end
+ return result
+ end
+
# Added by young
def course_settings_tabs
tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural, :course=>'1'},
diff --git a/public/javascripts/project.js b/public/javascripts/project.js
index 0a04b2a7b..f9f88703d 100644
--- a/public/javascripts/project.js
+++ b/public/javascripts/project.js
@@ -425,4 +425,35 @@ $(function(){
personalized_init();
});
-//cookie记忆html区块 显示/隐藏 的代码 end
\ No newline at end of file
+//cookie记忆html区块 显示/隐藏 的代码 end
+
+// 新建项目的时候判断是否与我已有的项目重复
+function judgeprojectname(){
+ $('#new_project').validate({
+ errorPlacement: function(error, element){
+ alert('error')
+ },
+ success: function(label){
+ alert('ok')
+ },
+ onkeyup: false,
+ rules : {
+ name:{required : true,
+ remote : {
+ url : 'projects/judge_same_projectname',
+ type:'get',
+ dataType:'text',
+ data:{
+ name : function(){ return $.trim( $("#name").val() ); }
+ },
+ dataFilter:function( data ){
+ if( data=='true')return false; else return true;
+ }
+ }
+ }
+ },
+ messages : {
+ name:{required : "请填写项目名称!",remote:'您已新建过同名项目,请修改项目名称!'}
+ }
+ });
+}
\ No newline at end of file
From 9c848374923ae4fcf7a3b6ce79ecd4d5d2c42a34 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Fri, 22 May 2015 16:38:26 +0800
Subject: [PATCH 3/9] ...
---
app/helpers/queries_helper.rb | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
index 1347c3026..5e78e3f98 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -255,7 +255,7 @@ module QueriesHelper
# Give it a name, required to be valid
@query = IssueQuery.new(:name => "_")
@query.project = @project
- params[:f] = %w(subject status_id priority_id author_id assigned_to_id created_on) unless params[:status_id].nil?
+ params[:f] = %w(subject status_id priority_id author_id assigned_to_id) unless params[:status_id].nil?
params[:op] = {'subject' => "~" ,
'status_id' => ( params[:status_id] == '0' ? "!":"=" ),
'priority_id' => ( params[:priority_id] == '0' ? "!":"=" ),
@@ -266,19 +266,19 @@ module QueriesHelper
'priority_id' => [params[:priority_id]],
'author_id' => [params[:author_id]],
'assigned_to_id' => [params[:assigned_to_id]]} unless params[:status_id].nil?
- if(params[:status_id] != nil)
- if( params[:issue_create_date_start]!=nil && params[:issue_create_date_start]!='' &&
- params[:issue_create_date_end]!=nil && params[:issue_create_date_end]!='' )
- params[:op][:created_on]='><'
- params[:v][:created_on]=[params[:issue_create_date_start],params[:issue_create_date_end]]
- elsif(params[:issue_create_date_start]!=nil && params[:issue_create_date_start]!='')
- params[:op][:created_on]='>='
- params[:v][:created_on]=[params[:issue_create_date_start]]
- elsif(params[:issue_create_date_end]!=nil && params[:issue_create_date_end]!='')
- params[:op][:created_on]='<='
- params[:v][:created_on]=[params[:issue_create_date_end]]
- end
- end
+ # if(params[:status_id] != nil)
+ # if( params[:issue_create_date_start]!=nil && params[:issue_create_date_start]!='' &&
+ # params[:issue_create_date_end]!=nil && params[:issue_create_date_end]!='' )
+ # params[:op][:created_on]='><'
+ # params[:v][:created_on]=[params[:issue_create_date_start],params[:issue_create_date_end]]
+ # elsif(params[:issue_create_date_start]!=nil && params[:issue_create_date_start]!='')
+ # params[:op][:created_on]='>='
+ # params[:v][:created_on]=[params[:issue_create_date_start]]
+ # elsif(params[:issue_create_date_end]!=nil && params[:issue_create_date_end]!='')
+ # params[:op][:created_on]='<='
+ # params[:v][:created_on]=[params[:issue_create_date_end]]
+ # end
+ # end
@query.build_from_params(params)
#session[:query] = {:project_id => @query.project_id, :filters => @query.filters, :group_by => @query.group_by, :column_names => @query.column_names}
# else
From 2ac2884bf1d1072a68cce15a1fd9dfcdcf35ef22 Mon Sep 17 00:00:00 2001
From: huang
Date: Sat, 23 May 2015 10:10:38 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9issue=E6=B3=A8=E5=85=A5?=
=?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=8A=A5=E9=94=99=EF=BC=88=E6=AF=94=E5=A6=82?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E5=B8=A6=E7=82=B9=E5=8F=B7=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/issues_controller.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 8acca7f81..4631a3348 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -169,7 +169,7 @@ class IssuesController < ApplicationController
attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?}
redirect_to new_project_issue_url(@issue.project, :issue => attrs)
else
- redirect_to issue_url(@issue)
+ redirect_to issue_url(@issue.id)
end
}
format.api { render :action => 'show', :status => :created, :location => issue_url(@issue) }
From 5460e9852682439ba8483083ac2fc98ad7f865e1 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Sat, 23 May 2015 10:10:47 +0800
Subject: [PATCH 5/9] ...
---
app/helpers/queries_helper.rb | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
index 5e78e3f98..43d01a5dd 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -255,7 +255,7 @@ module QueriesHelper
# Give it a name, required to be valid
@query = IssueQuery.new(:name => "_")
@query.project = @project
- params[:f] = %w(subject status_id priority_id author_id assigned_to_id) unless params[:status_id].nil?
+ params[:f] = %w(subject status_id priority_id author_id assigned_to_id created_on) unless params[:status_id].nil?
params[:op] = {'subject' => "~" ,
'status_id' => ( params[:status_id] == '0' ? "!":"=" ),
'priority_id' => ( params[:priority_id] == '0' ? "!":"=" ),
@@ -266,19 +266,22 @@ module QueriesHelper
'priority_id' => [params[:priority_id]],
'author_id' => [params[:author_id]],
'assigned_to_id' => [params[:assigned_to_id]]} unless params[:status_id].nil?
- # if(params[:status_id] != nil)
- # if( params[:issue_create_date_start]!=nil && params[:issue_create_date_start]!='' &&
- # params[:issue_create_date_end]!=nil && params[:issue_create_date_end]!='' )
- # params[:op][:created_on]='><'
- # params[:v][:created_on]=[params[:issue_create_date_start],params[:issue_create_date_end]]
- # elsif(params[:issue_create_date_start]!=nil && params[:issue_create_date_start]!='')
- # params[:op][:created_on]='>='
- # params[:v][:created_on]=[params[:issue_create_date_start]]
- # elsif(params[:issue_create_date_end]!=nil && params[:issue_create_date_end]!='')
- # params[:op][:created_on]='<='
- # params[:v][:created_on]=[params[:issue_create_date_end]]
- # end
- # end
+ if(params[:status_id] != nil)
+ if( params[:issue_create_date_start]!=nil && params[:issue_create_date_start]!='' &&
+ params[:issue_create_date_end]!=nil && params[:issue_create_date_end]!='' )
+ params[:op][:created_on]='><'
+ params[:v][:created_on]=[params[:issue_create_date_start],params[:issue_create_date_end]]
+ elsif(params[:issue_create_date_start]!=nil && params[:issue_create_date_start]!='')
+ params[:op][:created_on]='>='
+ params[:v][:created_on]=[params[:issue_create_date_start]]
+ elsif(params[:issue_create_date_end]!=nil && params[:issue_create_date_end]!='')
+ params[:op][:created_on]='<='
+ params[:v][:created_on]=[params[:issue_create_date_end]]
+ else
+ params[:op][:created_on]='!'
+ params[:v][:created_on]=''
+ end
+ end
@query.build_from_params(params)
#session[:query] = {:project_id => @query.project_id, :filters => @query.filters, :group_by => @query.group_by, :column_names => @query.column_names}
# else
From 491a7a13aa30cacab8697aa7142aa90506c78e87 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Sat, 23 May 2015 10:17:16 +0800
Subject: [PATCH 6/9] bug#2659
---
app/views/projects/invite_members.html.erb | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/app/views/projects/invite_members.html.erb b/app/views/projects/invite_members.html.erb
index 97b36406e..a6a13e2b7 100644
--- a/app/views/projects/invite_members.html.erb
+++ b/app/views/projects/invite_members.html.erb
@@ -79,20 +79,25 @@
user_ischeck=true;
}
});
- if(user_ischeck==false){
- nh_show_err_message('请选择用户!');
- return false;
- }
var role_ischeck=false;
$("input[name='membership[role_ids][]']").each(function(){
if($(this).prop('checked')){
role_ischeck=true;
}
});
+ if(user_ischeck==false && role_ischeck==false){
+ nh_show_err_message('请选择用户和角色!');
+ return false;
+ }
+ if(user_ischeck==false){
+ nh_show_err_message('请选择用户!');
+ return false;
+ }
if(role_ischeck==false){
nh_show_err_message('请选择角色!');
return false;
}
+ return true;
});
});
\ No newline at end of file
From 379de18cd6a4a015c112cf4d6b5c9e5c35f9f2ee Mon Sep 17 00:00:00 2001
From: huang
Date: Sat, 23 May 2015 10:40:15 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90?=
=?UTF-8?q?=E5=BA=93=E5=85=A8=E7=AB=99=E6=90=9C=E7=B4=A2=EF=BC=9A=201?=
=?UTF-8?q?=E3=80=81=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=B8=BA=E7=A9=BA?=
=?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E4=B8=8D=E5=85=81=E8=AE=B8?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=85=A8=E9=83=A8=E8=B5=84=E6=BA=90=202?=
=?UTF-8?q?=E3=80=81=E5=85=A8=E7=AB=99=E6=90=9C=E7=B4=A2=EF=BC=8C=E9=9D=9E?=
=?UTF-8?q?=E8=87=AA=E5=B7=B1=E4=B8=8A=E4=BC=A0=E7=9A=84=E8=B5=84=E6=BA=90?=
=?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E6=9F=A5=E7=9C=8B=203=E3=80=81?=
=?UTF-8?q?=E5=85=A8=E7=AB=99=E6=90=9C=E7=B4=A2=EF=BC=8C=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E8=83=BD=E8=AE=BE=E7=BD=AE=E5=85=AC?=
=?UTF-8?q?=E5=BC=80=E6=9D=83=E9=99=90=E7=9A=84=E8=B5=84=E6=BA=90=E5=9C=A8?=
=?UTF-8?q?=E5=85=A8=E5=B1=80=E6=90=9C=E7=B4=A2=E4=B8=AD=E4=B9=9F=E5=8F=AF?=
=?UTF-8?q?=E4=BB=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/files_controller.rb | 14 ++++++++------
app/helpers/application_helper.rb | 4 ++--
app/views/files/_project_file_list.html.erb | 10 +++++-----
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index aa2c9574b..0003f7586 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -67,9 +67,7 @@ class FilesController < ApplicationController
end
sort = "#{@sort} #{@order}"
end
-
# show_attachments [@course]
-
begin
q = "%#{params[:name].strip}%"
#(redirect_to stores_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
@@ -108,14 +106,18 @@ class FilesController < ApplicationController
end
sort = "#{@sort} #{@order}"
end
-
begin
q = "%#{params[:name].strip}%"
#(redirect_to stores_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
if params[:insite]
- @result = find_public_attache q,sort
- @result = visable_attachemnts_insite @result,@project
- @searched_attach = paginateHelper @result,10
+ if q == "%%"
+ @result = []
+ @searched_attach = paginateHelper @result,10
+ else
+ @result = find_public_attache q,sort
+ @result = visable_attachemnts_insite @result,@project
+ @searched_attach = paginateHelper @result,10
+ end
else
@result = find_project_attache q,@project,sort
@result = visable_attachemnts @result
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0836bf307..a07ff320d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -622,8 +622,8 @@ module ApplicationHelper
# 公开项目资源可以引用,admin和管理员和资源上传者拥有设置公开私有权限
def authority_pubilic_for_files(project, file)
@result = false
- if (is_project_manager?(User.current.id, @project.id) || file.author_id == User.current.id || User.current.admin) &&
- project_contains_attachment?(project,file) && file.container_id == project.id && file.container_type == "Project"
+ if (is_project_manager?(User.current.id, @project.id) && User.current.allowed_to?(:manage_files, project)) || file.author_id == User.current.id || User.current.admin &&
+ project_contains_attachment?(project,file) && file.container_id == project.id && file.container_type == "Project"
@result = true
end
return @result
diff --git a/app/views/files/_project_file_list.html.erb b/app/views/files/_project_file_list.html.erb
index d32d2319f..35aa36195 100644
--- a/app/views/files/_project_file_list.html.erb
+++ b/app/views/files/_project_file_list.html.erb
@@ -1,4 +1,4 @@
-
+<% delete_allowed = User.current.allowed_to?(:manage_files, project) %>
共有 <%= all_attachments.count%> 个资源
@@ -22,13 +22,13 @@
<% if User.current.logged? %>
<% if (manage_allowed || file.author_id == User.current.id) && project_contains_attachment?(project,file) %>
<%= link_to(l(:label_slected_to_other_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
- <% else %>
- <%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
- <% end %>
- <% if authority_pubilic_for_files(project, file) %>
+ <% if authority_pubilic_for_files(project, file) && delete_allowed %>
<%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open",:method => :post %>
+ <% end %>
+ <% else %>
+ <%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
<% end %>
<% end %>
From ceafa459fdebbf078fa536aa8592852b0a0b406d Mon Sep 17 00:00:00 2001
From: huang
Date: Sat, 23 May 2015 11:26:36 +0800
Subject: [PATCH 8/9] =?UTF-8?q?issues=E7=BC=96=E8=BE=91=E6=97=B6=E8=B7=B3?=
=?UTF-8?q?=E8=BD=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/issues_controller.rb | 3 ++-
app/views/issues/_action_menu.html.erb | 6 ++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 4631a3348..83f68d8d8 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -239,7 +239,8 @@ class IssuesController < ApplicationController
flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
respond_to do |format|
- format.html { redirect_back_or_default issue_path(@issue) }
+
+ format.html { redirect_to issue_url(@issue.id) }
format.api { render_api_ok }
end
else
diff --git a/app/views/issues/_action_menu.html.erb b/app/views/issues/_action_menu.html.erb
index ff498f100..a5823ede3 100644
--- a/app/views/issues/_action_menu.html.erb
+++ b/app/views/issues/_action_menu.html.erb
@@ -2,7 +2,5 @@
<%#= watcher_link_issue(@issue, User.current) %>
<%#= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'icon icon-copy' if User.current.allowed_to?(:add_issues, @project) %>
<%= link_to l(:button_delete), issue_path(@issue.id), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'talk_edit fr' if User.current.allowed_to?(:delete_issues, @project) %>
-
-
- <%= link_to l(:button_edit), edit_issue_path(@issue), :onclick => 'showAndScrollTo("all_attributes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project) %>
- <%= link_to l(:label_user_newfeedback), edit_issue_path(@issue), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:add_issue_notes, @project) %>
+<%= link_to l(:button_edit), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("all_attributes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project) %>
+<%= link_to l(:label_user_newfeedback), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:add_issue_notes, @project) %>
From c4c2da48db6e4955187d440abefa08e81891d711 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Sat, 23 May 2015 11:55:26 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug#2485:=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE--=E9=97=AE=E9=A2=98=E8=B7=9F=E8=B8=AA=E7=9B=B8?=
=?UTF-8?q?=E5=85=B3=E5=BB=BA=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/issues/index.html.erb | 54 +++++++++++++++------------------
1 file changed, 25 insertions(+), 29 deletions(-)
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index bb8ea1bef..d075ae301 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1,16 +1,9 @@