This commit is contained in:
@@ -102,7 +102,12 @@ class DeliverablesController < ApplicationController
|
|||||||
def issues
|
def issues
|
||||||
@query = Query.new(:name => "_")
|
@query = Query.new(:name => "_")
|
||||||
@query.project = @project
|
@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}
|
session[:query] = {:project_id => @query.project_id, :filters => @query.filters}
|
||||||
|
|
||||||
redirect_to :controller => 'issues', :action => 'index', :project_id => @project.id
|
redirect_to :controller => 'issues', :action => 'index', :project_id => @project.id
|
||||||
|
|||||||
@@ -79,7 +79,7 @@
|
|||||||
<% if allowed_management? %>
|
<% if allowed_management? %>
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
Missing on Deliverables:
|
Missing on <%= link_to('Deliverables:', :action => 'issues', :id => @project.id, :deliverable_id => :none) %>
|
||||||
</td>
|
</td>
|
||||||
<td class="calculation-column">
|
<td class="calculation-column">
|
||||||
<%= h number_to_currency(budget.amount_missing_on_deliverables, :precision => 0) %>
|
<%= h number_to_currency(budget.amount_missing_on_deliverables, :precision => 0) %>
|
||||||
@@ -90,7 +90,13 @@
|
|||||||
<% if allowed_management? %>
|
<% if allowed_management? %>
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
Missing on Issues:
|
Missing on <%= link_to('Issues:',
|
||||||
|
:controller => 'timelog',
|
||||||
|
:action => 'details',
|
||||||
|
:project_id => @project.id,
|
||||||
|
:sort_key => 'issue_id',
|
||||||
|
:sort_order => 'asc') %>
|
||||||
|
|
||||||
</td>
|
</td>
|
||||||
<td class="calculation-column">
|
<td class="calculation-column">
|
||||||
<%= h number_to_currency(budget.amount_missing_on_issues, :precision => 0) %>
|
<%= h number_to_currency(budget.amount_missing_on_issues, :precision => 0) %>
|
||||||
|
|||||||
Reference in New Issue
Block a user