From 47b4671c687c0dda05fd09261b660b2c47178231 Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 10 Jun 2015 10:18:36 -0700 Subject: added option to hide dates and hide budget --- app/controllers/version_reports_controller.rb | 2 ++ app/helpers/version_reports_helper.rb | 2 +- app/views/hooks/_view_report_link.html.erb | 2 ++ app/views/version_reports/_main_issue_row.html.erb | 4 +++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/version_reports_controller.rb b/app/controllers/version_reports_controller.rb index 6979943..3933a1b 100644 --- a/app/controllers/version_reports_controller.rb +++ b/app/controllers/version_reports_controller.rb @@ -12,6 +12,8 @@ class VersionReportsController < ApplicationController def show @show_time = params[:time] != 'false' @show_money = params[:money] != 'false' + @show_dates = params[:dates] != 'false' + @show_budget = params[:budget] != 'false' # the issues fetched here are the top level 'deliverable' issues. # so, we don't want to include issues from any other projects. @issues = @version.fixed_issues.where(:project_id => @version.project_id) diff --git a/app/helpers/version_reports_helper.rb b/app/helpers/version_reports_helper.rb index 71b4f3f..3045ced 100644 --- a/app/helpers/version_reports_helper.rb +++ b/app/helpers/version_reports_helper.rb @@ -52,7 +52,7 @@ module VersionReportsHelper end def hour_budget_error(issue) - return unless @show_time || @show_money + return unless @show_budget && (@show_time || @show_money) time_budget = (custom_field_value(issue, :hours) || 0).to_i money_budget = to_float(custom_field_value(issue, :money)||0).round if time_budget != 0 diff --git a/app/views/hooks/_view_report_link.html.erb b/app/views/hooks/_view_report_link.html.erb index b9758a3..665e066 100644 --- a/app/views/hooks/_view_report_link.html.erb +++ b/app/views/hooks/_view_report_link.html.erb @@ -4,4 +4,6 @@


+
+
diff --git a/app/views/version_reports/_main_issue_row.html.erb b/app/views/version_reports/_main_issue_row.html.erb index 8ca4904..dc4d3f6 100644 --- a/app/views/version_reports/_main_issue_row.html.erb +++ b/app/views/version_reports/_main_issue_row.html.erb @@ -13,7 +13,9 @@ - From <%= issue.start_date %> to <%= issue.due_date %>. + <%- if @show_dates -%> + From <%= issue.start_date %> to <%= issue.due_date %>. + <%- end -%>
<%= textilizable issue, :description %>
-- cgit v1.2.3