From d3e02821153efb85d92e2b5b923d5a52905b82bc Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 1 Aug 2015 16:58:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=89=88=E6=9C=AC=20--?= =?UTF-8?q?=20=E4=B8=8D=E5=85=B1=E4=BA=AB=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/settings/_new_versions.html.erb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/projects/settings/_new_versions.html.erb b/app/views/projects/settings/_new_versions.html.erb index 30da08614..557025eaa 100644 --- a/app/views/projects/settings/_new_versions.html.erb +++ b/app/views/projects/settings/_new_versions.html.erb @@ -13,8 +13,8 @@ <%= l(:field_effective_date) %> <%= l(:field_description) %> <%= l(:field_status) %> - <%= l(:field_sharing) %> - <%= l(:label_wiki_page) %> + + <% for version in @project.shared_versions.sort %> @@ -25,13 +25,13 @@ <%= format_date(version.effective_date) %> <%=h version.description %> <%= l("version_status_#{version.status}") %> - <%=h format_version_sharing(version.sharing) %> - - <%= link_to_if_authorized(h(truncate(version.wiki_page_title,:length=>20)), {:controller => 'wiki', - :action => 'show', - :project_id => version.project, + + + <%#= link_to_if_authorized(h(truncate(version.wiki_page_title,:length=>20)), {:controller => 'wiki', +# :action => 'show', +# :project_id => version.project, :id => Wiki.titleize(version.wiki_page_title)},:class=>"c_blue02") || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %> - + <% if version.project == @project && User.current.allowed_to?(:manage_versions, @project) %> <%= link_to l(:button_edit), edit_version_path(version), :class => 'c_purple' %> From 36456f8b2dbd612a23419709e03967976916add8 Mon Sep 17 00:00:00 2001 From: cxt Date: Sat, 1 Aug 2015 17:38:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=A7=81=E6=9C=89=E9=A1=B9=E7=9B=AE/?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9A=84=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=B6=85=E9=93=BE=E6=8E=A5=E6=97=A0=E6=B3=95=E7=82=B9=E5=87=BB?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=E5=B9=B6=E7=BB=99?= =?UTF-8?q?=E5=87=BA=E7=9B=B8=E5=BA=94=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_course_activities.html.erb | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/app/views/users/user_course_activities.html.erb b/app/views/users/user_course_activities.html.erb index bdebee6a5..eacb620f2 100644 --- a/app/views/users/user_course_activities.html.erb +++ b/app/views/users/user_course_activities.html.erb @@ -10,10 +10,19 @@ <%= rec[:item].user.show_name %> <%= get_activity_opt(rec[:item],rec[:e]) %> - - <%= get_activity_act_showname_htmlclear(rec[:item]) %> - + <% if( rec[:e].is_public == false || rec[:e].is_public == 0 ) %> + + <%= get_activity_act_showname_htmlclear(rec[:item]) %> + + <% else %> + + <%= get_activity_act_showname_htmlclear(rec[:item]) %> + + <% end %> + <%= time_tag(get_activity_act_createtime(rec[:item])).html_safe %> <% end %> \ No newline at end of file From 188c056e95f18d85e7103d521665d599603dd6a2 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 1 Aug 2015 17:42:58 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=B7=9F=E8=B8=AA?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E6=94=B9=E4=B8=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E7=9A=84id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/show.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 8c12d62e0..713fc84d2 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -6,7 +6,7 @@
<%= link_to "#{@issue.project.name}"+">", project_issues_path(@issue.project) %> - <%= "#" + @issue.project_index %> + <%= "#" + @issue.id.to_s %>
@@ -15,7 +15,7 @@

- <%= @issue.subject %> + <%= @issue.id %> <%= get_issue_priority(@issue.priority_id)[1] %>


From d1418f1bbe96f9adeef47ed13af8308f94c7ac10 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 1 Aug 2015 17:45:40 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=BB=E9=A2=98--id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 713fc84d2..01cbea1c1 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -15,7 +15,7 @@

- <%= @issue.id %> + <%= @issue.subject %> <%= get_issue_priority(@issue.priority_id)[1] %>