From 20899e64c044c855913594b02faa2ebb8d7e085a Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 26 Jun 2008 16:11:38 -0700 Subject: [PATCH] Added links to the issues and deliverables for missing budget amounts. #1383 #1384 --- app/controllers/deliverables_controller.rb | 7 ++++++- app/views/deliverables/_budget.html.erb | 10 ++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index f57f35c..35df71e 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -102,7 +102,12 @@ class DeliverablesController < ApplicationController def issues @query = Query.new(:name => "_") @query.project = @project - @query.add_filter("deliverable_id", '=', [params[:deliverable_id]]) + unless params[:deliverable_id] == 'none' + @query.add_filter("deliverable_id", '=', [params[:deliverable_id]]) + else + @query.add_filter("deliverable_id", '!*', []) # None + end + session[:query] = {:project_id => @query.project_id, :filters => @query.filters} redirect_to :controller => 'issues', :action => 'index', :project_id => @project.id diff --git a/app/views/deliverables/_budget.html.erb b/app/views/deliverables/_budget.html.erb index c2ab36b..7e3f00a 100644 --- a/app/views/deliverables/_budget.html.erb +++ b/app/views/deliverables/_budget.html.erb @@ -79,7 +79,7 @@ <% if allowed_management? %> - Missing on Deliverables: + Missing on <%= link_to('Deliverables:', :action => 'issues', :id => @project.id, :deliverable_id => :none) %> <%= h number_to_currency(budget.amount_missing_on_deliverables, :precision => 0) %> @@ -90,7 +90,13 @@ <% if allowed_management? %> - Missing on Issues: + Missing on <%= link_to('Issues:', + :controller => 'timelog', + :action => 'details', + :project_id => @project.id, + :sort_key => 'issue_id', + :sort_order => 'asc') %> + <%= h number_to_currency(budget.amount_missing_on_issues, :precision => 0) %>