- <%= render :partial => 'layouts/new_header'%>
+ else if($("#friend_organization").attr("checked") == "checked"){
+ project_type = 3;
+ }
+ $.get(
+ url,
+ { project_type: project_type},
+ function (data) {
+ if(data == 1)
+ {
+ $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_development_team), 1))%>");
+ $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/development_group')) %>');
+ $("#close_light").attr("onClick","close_window('development_group');");
+ }
+ else if(data == 2)
+ {
+ $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_research_group), 2))%>");
+ $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/research_team')) %>');
+ $("#close_light").attr("onClick","close_window('research_group');");
+ }
+ else if(data == 3)
+ {
+ $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_friend_organization), 3))%>");
+ $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/friend_group')) %>');
+ $("#close_light").attr("onClick","close_window('friend_organization');");
+ }
+ else
+ {
+ alert("服务器异常，请与管理员联系");
+ }
+ }
+ );
+ }
+
+
+
+
+
+ <%= render :partial => 'layouts/new_header'%>
+
+
+
+
+
+
+ <%= form_tag(projects_search_path, :method => :get, :id => "project_search_form", :class => "search_form") do %>
+ <%= text_field_tag 'name', params[:name], :placeholder => "项目名称", :class => "search_text fl", :onkeyup => "regexName('#{l(:label_search_conditions_not_null)}');" %>
+
+ <%= l(:label_search)%>
+
+
+
+ <% end %>
+
+
+
+
+
+
+ <%= image_tag(url_to_avatar(@project), :width => "60", :height => "60") %>
+
+
+ <%= l(:label_project_id)%><%= @project.id %>
+
+
+
+ <% text = @project.project_new_type == 1 ? l(:label_development_team) : (@project.project_new_type == 2 ? l(:label_research_group) : l(:label_friend_organization))%>
+ <% typeclass = @project.project_new_type == 1 ? "pr_kafa" : (@project.project_new_type == 2 ? "pr_keyan" : "pr_friend")%>
+ <%= render 'layouts/join_exit_project',{:text => text, :typeclass => typeclass} %>
+
+
+
+
+ <%= link_to l(:label_project_name)+"#{@project.name}", project_path(@project.id), :class=>"pr_info_name fl c_dark fb break_word" %>
+ <% if @project.is_public? %>
+ <%= l(:label_public)%>
+ <% else %>
+ <%= l(:label_private)%>
+ <% end %>
+
+
+ <% if @project.project_type == 0 %>
+ <%= l(:label_project_score)%> :
+ <%= link_to(format("%.2f" ,project_scores(@project) ).to_i, {:controller => 'projects',
+ :action => 'show_projects_score',
+ :remote => true,
+ :id => @project.id}, :class => "c_orange f14" ) %>
+ <% end %>
+
-
-
-
-
- <%= form_tag(projects_search_path, :method => :get, :id => "project_search_form", :class => "search_form") do %>
- <%= text_field_tag 'name', params[:name], :placeholder => "项目名称", :class => "search_text fl", :onkeyup => "regexName('#{l(:label_search_conditions_not_null)}');" %>
-
- <%= l(:label_search)%>
-
-
-
+
+
+ <% if User.current.member_of?(@project) %>
+
<%= l(:label_invite)%>
+
+ - <%= link_to l(:label_invite_new_user), :controller=>"projects", :action=>"invite_members_by_mail", :id => @project %>
+ <% if User.current.allowed_to?(:manage_members, @project) %>
+ - <%= link_to l(:label_invite_trustie_user), :controller=>"projects", :action=>"invite_members", :id => @project %>
<% end %>
-
-
-
-
-
-
- <%= image_tag(url_to_avatar(@project), :width => "60", :height => "60") %>
-
-
- <%= l(:label_project_id)%><%= @project.id %>
-
-
-
- <% text = @project.project_new_type == 1 ? l(:label_development_team) : (@project.project_new_type == 2 ? l(:label_research_group) : l(:label_friend_organization))%>
- <% typeclass = @project.project_new_type == 1 ? "pr_kafa" : (@project.project_new_type == 2 ? "pr_keyan" : "pr_friend")%>
- <%= render 'layouts/join_exit_project',{:text => text, :typeclass => typeclass} %>
-
-
-
-
- <%= link_to l(:label_project_name)+"#{@project.name}", project_path(@project.id), :class=>"pr_info_name fl c_dark fb break_word" %>
- <% if @project.is_public? %>
- <%= l(:label_public)%>
- <% else %>
- <%= l(:label_private)%>
- <% end %>
-
-
-
- <% if @project.project_type == 0 %>
- <%= l(:label_project_score)%> :
- <%= link_to(format("%.2f" ,project_scores(@project) ).to_i, {:controller => 'projects',
- :action => 'show_projects_score',
- :remote => true,
- :id => @project.id
- }, :class => "c_orange f14" ) %>
- <% end %>
-
-
-
-
-
-
-
-
-
- <% if User.current.member_of?(@project) %>
-
<%= l(:label_invite)%>
-
- - <%= link_to l(:label_invite_new_user), :controller=>"projects", :action=>"invite_members_by_mail", :id => @project %>
- <% if User.current.allowed_to?(:manage_members, @project) %>
- - <%= link_to l(:label_invite_trustie_user), :controller=>"projects", :action=>"invite_members", :id => @project %>
- <% end %>
-
- <% end %>
-
-
-
- <% if @project.project_new_type == 1 || @project.project_new_type.nil? %>
- <%= render :partial => 'layouts/base_development_group', :locals => {:project => @project}%>
- <% elsif @project.project_new_type == 2 %>
- <%= render :partial => 'layouts/base_research_team', :locals => {:project => @project}%>
- <% else %>
- <%= render :partial => 'layouts/base_friend_group', :locals => {:project => @project}%>
- <% end %>
-
-
-
-
-
-
-
-
-
<%= l(:label_project_overview)%>：
-
- <%= textilizable(@project.description) if @project.description && !@project.description.blank? %>
-
-
-
-
+
+ <% end %>
+
+
+
+ <% if @project.project_new_type == 1 || @project.project_new_type.nil? %>
+ <%= render :partial => 'projects/development_group', :locals => {:project => @project}%>
+ <% elsif @project.project_new_type == 2 %>
+ <%= render :partial => 'projects/research_team', :locals => {:project => @project}%>
+ <% else %>
+ <%= render :partial => 'projects/friend_group', :locals => {:project => @project}%>
+ <% end %>
+
+
+
+
-
-
-
<%= l(:label_tag)%>:
-
-
- <%= render :partial => 'tags/project_tag', :locals => {:obj => @project,:object_flag => "2"}%>
-
-
-
-
-
-
+
+
+
+
<%= l(:label_project_overview)%>：
+
+ <%= textilizable(@project.description) if @project.description && !@project.description.blank? %>
+
+
+
+
-
- <%= render_flash_messages %>
- <%= yield %>
- <%= call_hook :view_layouts_base_content %>
-
-
-
-
- <%= render :partial => 'layouts/new_footer'%>
+
+
+
<%= l(:label_tag)%>:
+
+
+ <%= render :partial => 'tags/project_tag', :locals => {:obj => @project,:object_flag => "2"}%>
+
+
-
-
-
- <% text = @project.project_new_type == 1 ? "development_group" : (@project.project_new_type == 2 ? "research_group" : "friend_organization")%>
-
-
+
-
123
- <%= render :partial => 'layouts/new_feedback' %>
-
- <%= l(:label_loading) %>
-
-
- <%= call_hook :view_layouts_base_body_bottom %>
-
+
+
+
+ <%= render_flash_messages %>
+ <%= yield %>
+ <%= call_hook :view_layouts_base_content %>
+
+
+
+
+ <%= render :partial => 'layouts/new_footer'%>
+
+
+
+
+ <% text = @project.project_new_type == 1 ? "development_group" : (@project.project_new_type == 2 ? "research_group" : "friend_organization")%>
+
+
+
+
123
+<%= render :partial => 'layouts/new_feedback' %>
+
+ <%= l(:label_loading) %>
+
+
+<%= call_hook :view_layouts_base_body_bottom %>
+
diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb
new file mode 100644
index 000000000..7f79fc5f1
--- /dev/null
+++ b/app/views/projects/_development_group.html.erb
@@ -0,0 +1,52 @@
+<% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count %>
+
+<% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
+
+ <%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %>
+ <% unless @project.issues.count == 0 %>
+
(<%= @project.issues.count %>)
+ <% end %>
+ <% if User.current.member_of?(@project) %>
+ <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %>
+ <% end %>
+
+<% end %>
+<% unless @project.enabled_modules.where("name = 'boards'").empty? %>
+
+ <%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %>
+ <% unless @project.boards.first.topics.count == 0 %>
+
(<%= @project.boards.first.topics.count %>)
+ <% end %>
+ <% if User.current.member_of?(@project) %>
+ <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
+ <% end %>
+
+<% end%>
+<% unless @project.enabled_modules.where("name = 'files'").empty? %>
+
+ <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %>
+ <% unless attaments_num == 0 %>
+
(<%= attaments_num %>)
+ <% end %>
+ <% if User.current.member_of?(@project) %>
+ <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
+ <% end %>
+
+<% end %>
+<%# --版本库被设置成私有、module中设置不显示、没有创建版本库 三种情况不显示-- %>
+<% if visible_repository?(@project) %>
+
+ <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
+
(<%= @project.repositories.count %>)
+
+<% end %>
+
+
<%= l(:label_project_more) %>
+
+ <%= render 'projects/tools_expand' %>
+
\ No newline at end of file
diff --git a/app/views/projects/_friend_group.html.erb b/app/views/projects/_friend_group.html.erb
new file mode 100644
index 000000000..dca5473f7
--- /dev/null
+++ b/app/views/projects/_friend_group.html.erb
@@ -0,0 +1,29 @@
+<% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count %>
+
+<% unless @project.enabled_modules.where("name = 'boards'").empty? %>
+
+ <%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %>
+ <% unless @project.boards.first.topics.count == 0 %>
+
(<%= @project.boards.first.topics.count %>)
+ <% end %>
+ <% if User.current.member_of?(@project) %>
+ <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
+ <% end %>
+
+<% end%>
+<% unless @project.enabled_modules.where("name = 'files'").empty? %>
+
+ <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %>
+ <% unless attaments_num == 0 %>
+
(<%= attaments_num %>)
+ <% end %>
+ <% if User.current.member_of?(@project) %>
+ <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
+ <% end %>
+
+<% end %>
\ No newline at end of file
diff --git a/app/views/projects/_research_team.html.erb b/app/views/projects/_research_team.html.erb
new file mode 100644
index 000000000..2a0ad1ef3
--- /dev/null
+++ b/app/views/projects/_research_team.html.erb
@@ -0,0 +1,40 @@
+<% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count %>
+
+<% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
+
+ <%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %>
+ <% unless @project.issues.count == 0 %>
+
(<%= @project.issues.count %>)
+ <% end %>
+ <% if User.current.member_of?(@project) %>
+ <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %>
+ <% end %>
+
+<% end %>
+<% unless @project.enabled_modules.where("name = 'boards'").empty? %>
+
+ <%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %>
+ <% unless @project.boards.first.topics.count == 0 %>
+
(<%= @project.boards.first.topics.count %>)
+ <% end %>
+ <% if User.current.member_of?(@project) %>
+ <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
+ <% end %>
+
+<% end%>
+<% unless @project.enabled_modules.where("name = 'files'").empty? %>
+
+ <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %>
+ <% unless attaments_num == 0 %>
+
(<%= attaments_num %>)
+ <% end %>
+ <% if User.current.member_of?(@project) %>
+ <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
+ <% end %>
+
+<% end%>
\ No newline at end of file
From 6c6ae38f7a18b149746dfc0ed05dc99267edc7ca Mon Sep 17 00:00:00 2001
From: huang
Date: Tue, 19 May 2015 10:19:49 +0800
Subject: [PATCH 08/24] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=B8=BB=E9=A1=B5?=
=?UTF-8?q?=E7=A7=81=E6=9C=89=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/stylesheets/application.css | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index edde12527..85ef3240a 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1904,6 +1904,18 @@ input.autocomplete.ajax-loading {
background-image: url(../images/loading.gif);
}
+.private_project {
+ position: relative;
+ bottom: 2px;
+ text-transform: uppercase;
+ background: #d22;
+ color: #fff;
+ font-weight: bold;
+ padding: 0px 2px 0px 2px;
+ font-size: 60%;
+ margin-right: 2px;
+ border-radius: 2px;
+}
/***** Flash & error messages ****/
#errorExplanation, div.flash, .nodata, .warning, .conflict {
padding: 4px 4px 4px 30px;
From 5cb9cc0903b737ad2cee8a34573f18e746d0c368 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 19 May 2015 10:35:17 +0800
Subject: [PATCH 09/24] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug#2211:course?=
=?UTF-8?q?=E4=B8=BB=E9=A1=B5--=E8=BF=98=E6=9C=89=E7=A9=BA=E9=97=B4?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=AF=BE=E7=A8=8B=E8=80=81=E5=B8=88=E7=9A=84?=
=?UTF-8?q?=E5=A7=93=E5=90=8D=E5=B0=B1=E4=B8=8D=E8=A6=81=E4=BB=A5=E7=9C=81?=
=?UTF-8?q?=E7=95=A5=E5=8F=B7=E7=BB=93=E6=9D=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/welcome/_course_list.html.erb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/views/welcome/_course_list.html.erb b/app/views/welcome/_course_list.html.erb
index 0d979c769..111c0abb1 100644
--- a/app/views/welcome/_course_list.html.erb
+++ b/app/views/welcome/_course_list.html.erb
@@ -5,13 +5,13 @@
<%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02" %>
- <%= link_to "(#{course_file_num})", course_files_path(@course), :class => "subnav_num c_orange" %>
+ <%= link_to "(#{course_file_num})", course_files_path(@course), :class => "subnav_num c_orange",:id=>'courses_files_count_nav' %>
<%= link_to( "+#{l(:label_upload_files)}", course_files_path(@course), :class => 'subnav_green ml95 c_white') if is_teacher %>
From f3da7979f85389097abf2c0d84ba8bb230b88ab7 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 19 May 2015 12:22:53 +0800
Subject: [PATCH 11/24] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug#2476=20:=20?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE--=E9=97=AE=E9=A2=98=E8=B7=9F=E8=B8=AA?=
=?UTF-8?q?=EF=BC=9A=E5=85=B3=E4=BA=8E=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6?=
=?UTF-8?q?=E7=9A=84=E6=8F=8F=E8=BF=B0=E7=9A=84=E6=98=BE=E7=A4=BA=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/views/attachments/_project_file_links.html.erb | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb
index a18d819da..fe0e9ab97 100644
--- a/app/views/attachments/_project_file_links.html.erb
+++ b/app/views/attachments/_project_file_links.html.erb
@@ -28,7 +28,8 @@
<% is_float ||= false %>
<% for attachment in attachments %>
-
+
+
<%if is_float%>
<% end%>
@@ -50,9 +51,10 @@
:id => attachment,
:filename => attachment.filename%>
<% end %>
-
- <%= h(truncate(" - #{attachment.description}", length: options[:length] ? options[:length]:15, omission: '...')) unless attachment.description.blank? %>
-
+
+
+ <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
+
(
<%= number_to_human_size attachment.filesize %>)
From 5184f9a31a830f87ff69cf4e7687fb369e35b27f Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 19 May 2015 13:06:02 +0800
Subject: [PATCH 12/24] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug#2622:=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE--=E9=97=AE=E9=A2=98=E8=B7=9F=E8=B8=AA=EF=BC=9A?=
=?UTF-8?q?=E7=82=B9=E5=87=BB=E9=97=AE=E9=A2=98=E5=88=97=E8=A1=A8=E5=88=86?=
=?UTF-8?q?=E9=A1=B5=E4=B8=AD=E6=9F=90=E9=A1=B5=EF=BC=8C=E6=80=BB=E6=98=AF?=
=?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=AF=A5=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=9C=80?=
=?UTF-8?q?=E4=B8=8B=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/issues/index.js.erb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/views/issues/index.js.erb b/app/views/issues/index.js.erb
index 34d2eb760..012d01c20 100644
--- a/app/views/issues/index.js.erb
+++ b/app/views/issues/index.js.erb
@@ -1 +1,3 @@
-$("#issue_list").html("<%= escape_javascript(render :partial => 'issues/list',:locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count})%>");
\ No newline at end of file
+$("#issue_list").html("<%= escape_javascript(render :partial => 'issues/list',:locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count})%>");
+$("#v_subject").focus();
+$("#v_subject").blur();
\ No newline at end of file
From b19f61edcbdb44b1454db29cbcf8d16ee9834fa4 Mon Sep 17 00:00:00 2001
From: huang
Date: Tue, 19 May 2015 14:02:14 +0800
Subject: [PATCH 13/24] =?UTF-8?q?=E7=A7=81=E6=9C=89=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E9=9D=9E=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98=E4=B8=8D=E8=83=BD?=
=?UTF-8?q?=E9=80=9A=E8=BF=87url=E8=AE=BF=E9=97=AE=E5=85=B3=E6=B3=A8?=
=?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/projects_controller.rb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 96807d2dc..041fa8529 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -676,11 +676,11 @@ class ProjectsController < ApplicationController
true
end
- # added by huang
-
def watcherlist
- if @watched
- @users -= watched.watcher_users
+ if !@project.is_public? && !User.current.member_of?(@project)
+ render_403
+ else
+ @users -= watched.watcher_users if @watched
end
end
From 0123ea32bf09cbb04457d800f99ffe43f4cc5283 Mon Sep 17 00:00:00 2001
From: huang
Date: Tue, 19 May 2015 14:13:28 +0800
Subject: [PATCH 14/24] =?UTF-8?q?=E7=A7=81=E6=9C=89=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E9=9D=9E=E9=A1=B9=E7=9B=AE=E6=88=90?=
=?UTF-8?q?=E5=91=98=E3=80=81=E6=9C=AA=E7=99=BB=E5=BD=95=E6=83=85=E5=86=B5?=
=?UTF-8?q?=E4=B8=8D=E8=83=BD=E8=AE=BF=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/boards_controller.rb | 16 ++++++++++------
app/controllers/projects_controller.rb | 2 +-
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 7ccfb0e10..4a27f02ff 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -32,13 +32,17 @@ class BoardsController < ApplicationController
#modify by nwb
@flag = params[:flag] || false
if @project
- @boards = @project.boards.includes(:last_message => :author).all
- @boards = [] << @boards[0] if @boards.any?
- if @boards.size == 1
- @board = @boards.first
- show and return
+ if !@project.is_public? && !User.current.member_of?(@project) && !User.current.admin?
+ render_403
+ else
+ @boards = @project.boards.includes(:last_message => :author).all
+ @boards = [] << @boards[0] if @boards.any?
+ if @boards.size == 1
+ @board = @boards.first
+ show and return
+ end
+ render :layout => false if request.xhr?
end
- render :layout => false if request.xhr?
elsif @course
if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
@boards = @course.boards.includes(:last_message => :author).all
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 041fa8529..06a157c0f 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -677,7 +677,7 @@ class ProjectsController < ApplicationController
end
def watcherlist
- if !@project.is_public? && !User.current.member_of?(@project)
+ if !@project.is_public? && !User.current.member_of?(@project) && !User.current.admin?
render_403
else
@users -= watched.watcher_users if @watched
From b645a1aa1e45bbfc0f5727c285b6979b91d68768 Mon Sep 17 00:00:00 2001
From: huang
Date: Tue, 19 May 2015 14:25:10 +0800
Subject: [PATCH 15/24] =?UTF-8?q?=E7=A7=81=E6=9C=89=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E6=88=90=E5=91=98=E5=88=97=E8=A1=A8=E9=9D=9E=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E6=88=90=E5=91=98=E4=B8=8D=E8=83=BD=E9=80=9A=E8=BF=87URL?=
=?UTF-8?q?=E8=AE=BF=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/projects_controller.rb | 12 ++++++++----
db/schema.rb | 9 ++-------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 06a157c0f..f8d08c7f5 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -417,10 +417,14 @@ class ProjectsController < ApplicationController
@members = @project.member_principals.includes(:roles, :principal).all.sort
end
else
- roles = Role.find_all_givable
- @subPage_title = l :label_member_list
- @members = @project.member_principals.includes(:roles, :principal).joins("LEFT JOIN #{OptionNumber.table_name} ON #{OptionNumber.table_name}.user_id = #{Member.table_name}.user_id and #{OptionNumber.table_name}.score_type = 2 AND #{Member.table_name}.project_id = #{OptionNumber.table_name}.project_id").order("#{OptionNumber.table_name}.total_score DESC").all
- @applied_members = appied_project_members(@project, @members)
+ if !@project.is_public? && !User.current.member_of?(@project) && !User.current.admin?
+ render_403
+ else
+ roles = Role.find_all_givable
+ @subPage_title = l :label_member_list
+ @members = @project.member_principals.includes(:roles, :principal).joins("LEFT JOIN #{OptionNumber.table_name} ON #{OptionNumber.table_name}.user_id = #{Member.table_name}.user_id and #{OptionNumber.table_name}.score_type = 2 AND #{Member.table_name}.project_id = #{OptionNumber.table_name}.project_id").order("#{OptionNumber.table_name}.total_score DESC").all
+ @applied_members = appied_project_members(@project, @members)
+ end
end
@members = paginateHelper @members
render :layout => 'base_courses' if @project.project_type == 1
diff --git a/db/schema.rb b/db/schema.rb
index 601963956..e3828b0be 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -541,7 +541,6 @@ ActiveRecord::Schema.define(:version => 20150514133640) do
t.integer "is_teacher_score", :default => 0
end
- add_index "homework_attaches", ["bid_id"], :name => "bid_id"
add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id"
create_table "homework_evaluations", :force => true do |t|
@@ -556,9 +555,7 @@ ActiveRecord::Schema.define(:version => 20150514133640) do
t.integer "bid_id"
end
- add_index "homework_for_courses", ["bid_id"], :name => "bid_id"
add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id"
- add_index "homework_for_courses", ["course_id"], :name => "course_id"
add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id"
create_table "homework_users", :force => true do |t|
@@ -1163,14 +1160,12 @@ ActiveRecord::Schema.define(:version => 20150514133640) do
create_table "students_for_courses", :force => true do |t|
t.integer "student_id"
t.integer "course_id"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
- t.integer "student_idCopy"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
end
add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id"
add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id"
- add_index "students_for_courses", ["student_id"], :name => "student_id"
create_table "taggings", :force => true do |t|
t.integer "tag_id"
From 085b86bbbec4a55f19a0f4874f33047dffd525e4 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 19 May 2015 15:23:13 +0800
Subject: [PATCH 16/24] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug#2585:IE11.0?=
=?UTF-8?q?=E4=B8=AD--=E8=AF=BE=E7=A8=8B--=E5=AD=A6=E7=94=9F=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=EF=BC=9A=E5=AF=BC=E5=87=BA=E5=88=97=E8=A1=A8=E6=96=87?=
=?UTF-8?q?=E4=BB=B6=E5=90=8D=E4=B9=B1=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/courses_controller.rb | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index d616daadc..be69b1777 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -342,10 +342,15 @@ class CoursesController < ApplicationController
def export_course_member_excel
@all_members = student_homework_score(0,0,0,"desc")
+ filename="#{@course.teacher.lastname.to_s + @course.teacher.firstname.to_s }_#{@course.name}_#{@course.time.to_s + @course.term}#{l(:excel_member_list)}";
+ # 如果是ie11 需要转码
+ if(/rv\:11\.0/.match(request.env["HTTP_USER_AGENT"]) != nil)
+ filename= URI::encode(filename)
+ end
respond_to do |format|
format.xls {
send_data(member_to_xls(@all_members,@course.course_groups), :type => "text/excel;charset=utf-8; header=present",
- :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname.to_s }_#{@course.name}_#{@course.time.to_s + @course.term}#{l(:excel_member_list)}.xls")
+ :filename => "#{filename}.xls")
}
end
end
From 196c3b48b1d5ee5361dd17378302c863c43ebcf8 Mon Sep 17 00:00:00 2001
From: huang
Date: Tue, 19 May 2015 16:11:22 +0800
Subject: [PATCH 17/24] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E5=8C=BA?=
=?UTF-8?q?=E5=88=86=E2=80=9C=E5=BC=95=E5=85=A5=E6=88=91=E7=9A=84=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE=E2=80=9D=E5=92=8C=E2=80=9C=E5=BC=95=E5=85=A5=E6=88=91?=
=?UTF-8?q?=E7=9A=84=E5=85=B6=E5=AE=83=E9=A1=B9=E7=9B=AE=E2=80=9D=20?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=BB=BA=E9=A1=B9=E7=9B=AE=E5=86=B2?=
=?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/issues_controller.rb | 11 +++--------
app/controllers/projects_controller.rb | 12 +++++++-----
app/views/files/_project_file_list.html.erb | 12 ++++++++----
3 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index b6035ca51..8acca7f81 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -84,15 +84,10 @@ class IssuesController < ApplicationController
@issue_pages = Paginator.new @issue_count, @limit, params['page']
@offset ||= @issue_pages.offset
@issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
- :order => sort_clause,
- :offset => @offset,
- :limit => @limit)
+ :order => sort_clause,
+ :offset => @offset,
+ :limit => @limit)
@issue_count_by_group = @query.issue_count_by_group
-
-
-
-
-
respond_to do |format|
format.js
format.html { render :template => 'issues/index', :layout => @project_base_tag }#by young
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index f8d08c7f5..c79d0862f 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -31,7 +31,7 @@ class ProjectsController < ApplicationController
before_filter :authorize, :only => [:show, :settings, :edit, :sort_project_members, :update, :modules, :close, :reopen,:view_homework_attaches,:course]
before_filter :authorize_global, :only => [:new, :create,:view_homework_attaches]
before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar]
- before_filter :file, :statistics, :watcherlist
+ before_filter :file, :statistics #:watcherlist
# 除非项目内人员，不可查看成员, TODO: 完了写报表里去
before_filter :memberAccess, only: :member
@@ -681,10 +681,12 @@ class ProjectsController < ApplicationController
end
def watcherlist
- if !@project.is_public? && !User.current.member_of?(@project) && !User.current.admin?
- render_403
- else
- @users -= watched.watcher_users if @watched
+ unless @project.nil?
+ if !@project.is_public? && !User.current.member_of?(@project) && !User.current.admin?
+ render_403
+ else
+ @users -= watched.watcher_users if @watched
+ end
end
end
diff --git a/app/views/files/_project_file_list.html.erb b/app/views/files/_project_file_list.html.erb
index 1042be584..d32d2319f 100644
--- a/app/views/files/_project_file_list.html.erb
+++ b/app/views/files/_project_file_list.html.erb
@@ -20,12 +20,16 @@
<%= link_to_attachment file, :download => true,:text => truncate(file.filename,length: 35, omission: '...'), :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l" %>
<% if User.current.logged? %>
- <%= 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) %>
- <% if authority_pubilic_for_files(project, file) %>
+ <% 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) %>
- <%= 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 %>
+ <%= 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 %>
+ <% end %>
<% end %>
From c711e29cd58b954083b831a34f7823e8a7747a3d Mon Sep 17 00:00:00 2001
From: huang
Date: Wed, 20 May 2015 09:35:42 +0800
Subject: [PATCH 18/24] =?UTF-8?q?1=E3=80=81=E9=A1=B9=E7=9B=AE=E6=88=90?=
=?UTF-8?q?=E5=91=98=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E7=A7=81=E6=9C=89issue=E3=80=82=202=E3=80=81=E5=8C=BA=E5=88=86?=
=?UTF-8?q?=E4=B8=8D=E5=8F=AF=E8=A7=81=E5=92=8C=E5=8F=AF=E8=A7=81issue?=
=?UTF-8?q?=E7=9A=84=E6=95=B0=E7=9B=AE=E7=BB=9F=E8=AE=A1=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/issues/index.html.erb | 4 ++--
app/views/issues/new.html.erb | 2 --
app/views/projects/_development_group.html.erb | 4 ++--
app/views/projects/_research_team.html.erb | 2 +-
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 5307b3bf6..3abc7101c 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -66,8 +66,8 @@
<%# end %>
-
<%= l(:label_issues_sum) %>：<%= @project.issues.count %>
- <%= l(:lable_issues_undo) %>：<%= @project.issues.where('status_id in (1,2,4,6)').count %>
+
<%= l(:label_issues_sum) %>：<%= @project.issues.visible.all.count %>
+ <%= l(:lable_issues_undo) %>：<%= @project.issues.where('status_id in (1,2,4,6)').visible.all.count %>
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index 62e6947a7..137e203ef 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -2,7 +2,6 @@
<%= l(:label_issue_new) %>
<%= call_hook(:view_issues_new_top, {:issue => @issue}) %>
-
<%= labelled_form_for @issue, :url => project_issues_path(@project),
:html => {:id => 'issue-form', :multipart => true} do |f| %>
<%= error_messages_for 'issue' %>
@@ -16,7 +15,6 @@
<%#= preview_link preview_new_issue_path(:project_id => @project), 'issue-form', 'preview', {:class => "blue_btn fl ml10"} %>
<% end %>
-
<% content_for :header_tags do %>
diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb
index 7f79fc5f1..676761831 100644
--- a/app/views/projects/_development_group.html.erb
+++ b/app/views/projects/_development_group.html.erb
@@ -8,8 +8,8 @@
<% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
<%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %>
- <% unless @project.issues.count == 0 %>
-
(<%= @project.issues.count %>)
+ <% unless @project.issues.visible.all.count == 0 %>
+
(<%= @project.issues.visible.all.count %>)
<% end %>
<% if User.current.member_of?(@project) %>
<%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %>
diff --git a/app/views/projects/_research_team.html.erb b/app/views/projects/_research_team.html.erb
index 2a0ad1ef3..b2b0e3c33 100644
--- a/app/views/projects/_research_team.html.erb
+++ b/app/views/projects/_research_team.html.erb
@@ -9,7 +9,7 @@
<%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %>
<% unless @project.issues.count == 0 %>
-
(<%= @project.issues.count %>)
+
(<%= @project.issues.visible.all.count %>)
<% end %>
<% if User.current.member_of?(@project) %>
<%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %>
From fa563b60d5f6318cb68ab717ec60b44573c0072d Mon Sep 17 00:00:00 2001
From: huang
Date: Wed, 20 May 2015 11:12:25 +0800
Subject: [PATCH 19/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AEissue=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E5=91=A8=E6=8A=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/helpers/issues_helper.rb | 32 ++++++++++++++------------------
app/views/issues/_list.html.erb | 2 +-
app/views/issues/show.html.erb | 2 +-
public/stylesheets/public.css | 9 +++++----
4 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index b72a191db..4dfb1b799 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -67,29 +67,25 @@ module IssuesHelper
s.html_safe
end
- #获取跟踪类型
- #REDO:时间紧需要优化，两个方法可以综合成一个
+ #获取跟踪类型及样式
+ #REDO:时间紧可以优化.
def get_issue_type(value)
+ issuetype = []
if value == "缺陷" || value == 1
- class_type = "red_btn_cir ml10"
+ issuetype << "red_btn_cir ml10"
+ issuetype << "缺陷"
elsif value == "功能" || value == 2
- class_type = "blue_btn_cir ml10"
+ issuetype << "blue_btn_cir ml10"
+ issuetype << "功能"
elsif value == "支持" || value == 3
- class_type = "green_btn_cir ml10"
+ issuetype << "green_btn_cir ml10"
+ issuetype << "支持"
+ elsif value == "任务" || value == 4
+ issuetype << "orange_btn_cir ml10"
+ issuetype << "任务"
else
- class_type = "orange_btn_cir ml10"
- end
- end
-
- def get_issue_typevalue(value)
- if value == "缺陷" || value == 1
- assign = "缺陷"
- elsif value == "功能" || value == 2
- assign = "功能"
- elsif value == "支持" || value == 3
- assign = "支持"
- else
- assign = "任务"
+ issuetype << "bgreen_btn_cir ml10"
+ issuetype << "周报"
end
end
diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index fa34ecb3b..616e205c4 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -12,7 +12,7 @@
<%= link_to issue.author.name, user_path(issue.author), :class => "problem_name c_orange fl" %>
<%= l(:label_post_on_issue) %>(<%= "#{raw column_content[2]}" %>)：
- <%=link_to "#{column_content[4]}#{get_issue_typevalue(column_content[1])}".html_safe, issue_path(issue.id), :class => "problem_tit_a break_word",:target => "_blank" %>
+ <%=link_to "#{column_content[4]}#{get_issue_type(column_content[1])[1]}".html_safe, issue_path(issue.id), :class => "problem_tit_a break_word",:target => "_blank" %>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 1d1802172..cff5aae06 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -14,7 +14,7 @@
<%= @issue.subject %>
- <%= get_issue_typevalue(@issue.tracker_id) %>
+ <%= get_issue_type(@issue.tracker_id)[1] %>
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 4624b26c9..ebc92a972 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -173,10 +173,11 @@ a:hover.blue_u_btn{background:#64bdd9; color:#fff;}
.nolink_btn{ background:#BCBCBC; color: #fff; padding:2px 5px;}
.more_btn{-moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #9DCEFF; color:#9DCEFF; border-radius:3px; padding:0px 3px;}
/*.upbtn{ margin:42px 0 0 10px; border:none; color:#999; }*/
-.red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;white-space:nowrap;}
-.green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;white-space:nowrap;}
-.blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;white-space:nowrap;}
-.orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;white-space:nowrap;}
+.red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
+.bgreen_btn_cir{ background:#1abc9c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
/* commonpic */
.pic_date{ display:block; background:url(../images/new_project/public_icon.png) -31px 0 no-repeat; width:16px; height:15px; float:left;}
.pic_add{ display:block; background:url(../images/new_project/public_icon.png) -31px -273px no-repeat; width:16px; height:15px; float:left;}
From a35abf1f1f7257949a6d562357ba17673fcbfa27 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Wed, 20 May 2015 11:56:34 +0800
Subject: [PATCH 20/24] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug#2180:=E8=AF=BE?=
=?UTF-8?q?=E7=A8=8B=E8=B5=84=E6=BA=90=E5=BA=93=EF=BC=9A=E6=88=90=E5=8A=9F?=
=?UTF-8?q?=E5=BC=95=E5=85=A5=E8=B5=84=E6=BA=90=E5=90=8E=EF=BC=8C=E2=80=9C?=
=?UTF-8?q?=E9=80=89=E4=BA=BA=E6=88=91=E7=9A=84=E8=AF=BE=E7=A8=8B=E2=80=9D?=
=?UTF-8?q?=E6=9C=AA=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0=E4=B8=BA=E2=80=9C?=
=?UTF-8?q?=E9=80=89=E5=85=A5=E6=88=91=E7=9A=84=E5=85=B6=E4=BB=96=E8=AF=BE?=
=?UTF-8?q?=E7=A8=8B=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/files_controller.rb | 9 +-
.../add_exist_file_to_courses.js.erb | 1 +
app/views/files/_course_file.html.erb | 11 +++
app/views/files/_course_list.html.erb | 82 +++++++++----------
app/views/files/searchone4reload.html.erb | 39 +++++++++
config/routes.rb | 1 +
6 files changed, 101 insertions(+), 42 deletions(-)
create mode 100644 app/views/files/searchone4reload.html.erb
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 69e7105aa..aa2c9574b 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -23,7 +23,7 @@ class FilesController < ApplicationController
before_filter :auth_login1, :only => [:index]
before_filter :logged_user_by_apptoken,:only => [:index]
before_filter :find_project_by_project_id#, :except => [:getattachtype]
- before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search,:search_project,:quote_resource_show_project,:search_tag_attachment]
+ before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,:search_tag_attachment]
helper :sort
include SortHelper
@@ -46,6 +46,13 @@ class FilesController < ApplicationController
@obj_attachments = paginateHelper @all_attachments,10
end
+ def searchone4reload
+ attachment = Attachment.find_by_id(params[:fileid]);
+ respond_to do |format|
+ format.html{render :layout => nil,:locals=>{:file=>attachment,:course=>@course}}
+ end
+ end
+
def search
sort = ""
@sort = ""
diff --git a/app/views/attachments/add_exist_file_to_courses.js.erb b/app/views/attachments/add_exist_file_to_courses.js.erb
index eec1e255a..c84a89184 100644
--- a/app/views/attachments/add_exist_file_to_courses.js.erb
+++ b/app/views/attachments/add_exist_file_to_courses.js.erb
@@ -4,4 +4,5 @@
$("#error_show").html("<%= @message.html_safe %>");
<% else %>
closeModal();
+ searchone4reload('<%=params[:file_id]%>');
<% end %>
diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb
index 1769b1a45..ebccfcaf4 100644
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@@ -1,4 +1,15 @@
@@ -21,7 +21,7 @@
-
+
<% show_memu = show_project_memu User.current%>
From 19d911cf9520e5fd65c313dc2de0ccab81d9a7ea Mon Sep 17 00:00:00 2001
From: huang
Date: Wed, 20 May 2015 14:40:51 +0800
Subject: [PATCH 22/24] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A0=8F=E4=B8=AD=E6=B7=BB=E5=8A=A0=E2=80=9C?=
=?UTF-8?q?=E6=88=91=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/helpers/issues_helper.rb | 8 ++++++++
app/views/issues/index.html.erb | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 4dfb1b799..aae150728 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -89,6 +89,14 @@ module IssuesHelper
end
end
+ def principals_options_for_isuue_list(project)
+ if User.current.member_of?(project)
+ project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["<< #{l(:label_me)} >>", User.current.id]).unshift(["指派给", 0])
+ else
+ project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["指派给", 0])
+ end
+ end
+
def render_issue_subject_with_tree(issue)
s = ''
ancestors = issue.root? ? [] : issue.ancestors.visible.all
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 3abc7101c..ebbff0bfb 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -39,7 +39,7 @@
-
-