diff options
| author | elijah <elijah@riseup.net> | 2015-06-10 10:18:36 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2015-06-10 10:18:36 -0700 |
| commit | 47b4671c687c0dda05fd09261b660b2c47178231 (patch) | |
| tree | 56c2472d693a6521273299351fd210ed5d9c9937 | |
| parent | 3b7fa50318ec8ebad77083ca4cb2188177942b47 (diff) | |
added option to hide dates and hide budget
| -rw-r--r-- | app/controllers/version_reports_controller.rb | 2 | ||||
| -rw-r--r-- | app/helpers/version_reports_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/hooks/_view_report_link.html.erb | 2 | ||||
| -rw-r--r-- | 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 @@ <button type="submit">Detailed Report</button><br> <label><input type="checkbox" name="time" value="false">Hide Time</label><br> <label><input type="checkbox" name="money" value="false">Hide Money</label><br> + <label><input type="checkbox" name="dates" value="false">Hide Dates</label><br> + <label><input type="checkbox" name="budget" value="false">Hide Budget</label><br> </form> 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 @@ </tr> <tr> <td colspan="3"> - From <%= issue.start_date %> to <%= issue.due_date %>. + <%- if @show_dates -%> + From <%= issue.start_date %> to <%= issue.due_date %>. + <%- end -%> <div class="wiki"> <%= textilizable issue, :description %> </div> |