From ee00d7d20a8a68c9f3ad6dfd9447b6b6cc020e27 Mon Sep 17 00:00:00 2001 From: z9hang Date: Wed, 17 Sep 2014 15:58:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=BC=80=E6=94=BE=EF=BC=8C=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E8=B4=B4=E5=90=A7=E8=B5=84=E6=BA=90=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=B5=84=E6=BA=90=E7=9A=84container=5Ftype?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=B8=BA=E2=80=98Memo=E2=80=99=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/attachments_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 62bef8fb1..2d5149c09 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -361,7 +361,7 @@ private def login_without_softapplication referer = request.headers['Referer'] - require_login unless referer =~ /softapplication/ || referer =~ /memos/ + require_login unless referer =~ /softapplication/ || @attachment.container_type == "Memo" end def renderTag From 0342dfa4c5733eb90a569f65f05a826c39b0c1f8 Mon Sep 17 00:00:00 2001 From: linhk <304431313@.com> Date: Wed, 17 Sep 2014 16:02:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/views/code_review/index.html.erb | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/redmine_code_review/app/views/code_review/index.html.erb b/plugins/redmine_code_review/app/views/code_review/index.html.erb index d03ab3e1e..e342d9b3e 100644 --- a/plugins/redmine_code_review/app/views/code_review/index.html.erb +++ b/plugins/redmine_code_review/app/views/code_review/index.html.erb @@ -51,7 +51,7 @@ function change_option(flag) { <% else %> - +
<%= sort_header_tag "#{Issue.table_name}.id", :caption => '#' %> @@ -70,18 +70,18 @@ function change_option(flag) { <% for review in @reviews %> - - - - - - - - - + + + + + <% end %> From 5d65901ebd919d000f552fd6b8fe46d638a333b1 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 17 Sep 2014 16:08:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/contests/index.html.erb | 107 +++++++++++------------------- 1 file changed, 39 insertions(+), 68 deletions(-) diff --git a/app/views/contests/index.html.erb b/app/views/contests/index.html.erb index 998eabf80..115b154e6 100644 --- a/app/views/contests/index.html.erb +++ b/app/views/contests/index.html.erb @@ -1,75 +1,46 @@
- <%= form_tag({:controller => 'contests', :action => 'index'}, :method => :get) do %> -
+ <%= link_to review.issue.id.to_s, {:controller => 'issues', :action => 'show', :id => review.issue.id}, :title => review.issue.subject %> + <%=h review.issue.status %> + <%=h review.issue.subject %> + <% review_path = URI.decode(review.path) codepath = review_path @@ -91,11 +91,11 @@ function change_option(flag) { -%> <%= link_to(raw(codepath), {:controller => 'code_review', :action => 'show', :id => @project, :review_id => review.id}, :title => review_path) -%> <%=h review.line %><%=h review.revision %><%=h review.committer %><%=h review.user.name %><%=h format_time(review.created_at) %><%=h review.line %><%=h review.revision %><%=h review.committer %><%=h review.user.name %><%=h format_time(review.created_at) %>
- - - - + + + + + + +
<%= l(:label_contest_innovate) %><%= l(:label_user_location) %> : - <% if User.current.logged? %> + <%= form_tag({:controller => 'contests', :action => 'index'}, :method => :get) do %> + + + + + - - - - - - -
<%= l(:label_contest_innovate) %><%= l(:label_user_location) %> : + <% if User.current.logged? %> <% unless User.current.user_extensions.identity == 1 %> -<<<<<<< HEAD - - <%= link_to(l(:label_newtype_contest), - contest_new_contests_path, - :class => 'icon icon-add', - :target => "_blank") - %> -======= <%= link_to(l(:label_newtype_contest), new_contest_contests_path, :class => 'icon icon-add', :target => "_blank") %> ->>>>>>> 5a14798290ec4fe5a5aeedb507e7f0077df96efc - - <% end %> - <% end %> - -
- <%= text_field_tag 'name', params[:name], :size => 30 %> - <%= hidden_field_tag 'project_type', params[:project_type] %> - <%= submit_tag l(:label_search), - :class => "enterprise", - :name => "contests_search" - %> -
-
- -<<<<<<< HEAD - -======= ->>>>>>> 5a14798290ec4fe5a5aeedb507e7f0077df96efc - <%= link_to request.host()+"/contests", contests_path %> - - - - <%=link_to l(:field_homepage), home_path %> > -<<<<<<< HEAD - - <%=link_to l(:label_contest_innovate), contests_path %> -======= - <%=link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %> ->>>>>>> 5a14798290ec4fe5a5aeedb507e7f0077df96efc - -
- <% end %> - -<% if @contests.size > 0%> -<%= sort_contest(@s_state)%> -
- <%= render :partial => 'contest_list', - :locals => {:contests => @contests, :contest_pages => @contest_pages} - %> + + <% end %> + <% end %> +
+
+ <%= text_field_tag 'name', params[:name], :size => 30 %> + <%= hidden_field_tag 'project_type', params[:project_type] %> + <%= submit_tag l(:label_search), :class => "enterprise", :name => "contests_search" %> +
+
+ + <%= link_to request.host()+"/contests", contests_path %> + + + + <%=link_to l(:field_homepage), home_path %> > + <%=link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %> + +
+ <% end %> +<% if @contests.size > 0%> + <%= sort_contest(@s_state)%> +
+ <%= render :partial => 'contest_list', :locals => {:contests => @contests, :contest_pages => @contest_pages} %> +
<% else %> <%= render :partial => "layouts/no_content"%> <% end %> From c31b50421ef243598c14c0a2cd905113be290b23 Mon Sep 17 00:00:00 2001 From: linhk <304431313@.com> Date: Wed, 17 Sep 2014 16:35:52 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=8F=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E3=80=81=E8=AF=BE=E7=A8=8B=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_base_header.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index 37b8aa7e7..db275b90b 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -54,7 +54,7 @@ @@ -73,7 +73,7 @@