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 diff --git a/app/views/contests/index.html.erb b/app/views/contests/index.html.erb deleted file mode 100644 index 293715c62..000000000 --- a/app/views/contests/index.html.erb +++ /dev/null @@ -1,53 +0,0 @@ -
- <%= 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 %> - - <%= link_to(l(:label_newtype_contest), new_contest_contests_path, :class => 'icon icon-add', :target => "_blank") %> - <% end %> - <% end %> - - -
- - <%= link_to request.host()+"/contests", contests_path %> - - - <%=link_to l(:field_homepage), home_path %> > - <%=link_to l(:label_contest_innovate), contests_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 %> - -<% html_title l(:label_contest_list)%> -s \ No newline at end of file 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 @@ 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 %>
+ <%= 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) %>