From c610f7c1ce8158ba2d4b91019698df8168cc7947 Mon Sep 17 00:00:00 2001 From: william Date: Sat, 17 Aug 2013 08:35:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B6=E5=92=8C=E8=B8=A9=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 6 +++--- app/views/issues/_relations.html.erb | 7 +++++++ config/routes.rb | 1 + public/images/praise_tread/praise_false.png | Bin 3736 -> 3738 bytes public/images/praise_tread/tread_false.png | Bin 3740 -> 3742 bytes 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 65b306024..6254c24b3 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -365,9 +365,9 @@ class ProjectsController < ApplicationController format.html { redirect_to admin_projects_path } format.api { render_api_ok } end - else - render :layout => "base" - end + else + render :layout => "base" + end # hide project in layout @project = nil diff --git a/app/views/issues/_relations.html.erb b/app/views/issues/_relations.html.erb index 0cffa8f53..da7da6b80 100644 --- a/app/views/issues/_relations.html.erb +++ b/app/views/issues/_relations.html.erb @@ -7,12 +7,15 @@

<%=l(:label_related_issues)%>

<% if @relations.present? %> +
<% @relations.each do |relation| %> <% other_issue = relation.other_issue(@issue) -%> + + + + + +
<%= check_box_tag("ids[]", other_issue.id, false, :id => nil) %> <%= l(relation.label_for(@issue)) %> <%= "(#{l('datetime.distance_in_words.x_days', :count => relation.delay)})" if relation.delay && relation.delay != 0 %> @@ -21,7 +24,11 @@ <%=h other_issue.status.name %> <%= format_date(other_issue.start_date) %><%= format_date(other_issue.due_date) %><%= link_to image_tag('link_break.png'), relation_path(relation), :remote => true, diff --git a/config/routes.rb b/config/routes.rb index 4ff256bad..717db4661 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -66,6 +66,7 @@ RedmineApp::Application.routes.draw do match '/journals/diff/:id', :to => 'journals#diff', :id => /\d+/, :via => :get match '/journals/edit/:id', :to => 'journals#edit', :id => /\d+/, :via => [:get, :post] + get '/projects/:project_id/issues/gantt', :to => 'gantts#show', :as => 'project_gantt' get '/issues/gantt', :to => 'gantts#show' diff --git a/public/images/praise_tread/praise_false.png b/public/images/praise_tread/praise_false.png index ed63e619d998a6a53d76bdea0e4b4fa52db5f1ca..b313b8417ec71e6266aad9afbe8d7a6187a46e6d 100644 GIT binary patch delta 110 zcmV-!0FnQg9hx1mG!AA_NklFDj9@P$o~MRKTEIz^D+gDCcY?{aoDx0JSa|45O3| QO8@`>07*qoM6N<$g6zvI?EnA( delta 108 zcmV-y0F(ck9he=kG!A4>Nkl1d5=9so5 zZGv<1cuw;6t>m!iEas{pBPhxjmB?EtlU^wmFen!=Dg-Rbxmrm-SI+k07*qoM6N<$g8KX~p8x;= delta 112 zcmV-$0FVEk9h@DoG!AG}Nkla+HF+rk%C0!2 ze{4G<;!~4&rV