diff --git a/app/controllers/cost_objects_controller.rb b/app/controllers/cost_objects_controller.rb index 23d7d02d35..1b52ba52fa 100644 --- a/app/controllers/cost_objects_controller.rb +++ b/app/controllers/cost_objects_controller.rb @@ -35,7 +35,7 @@ class CostObjectsController < ApplicationController def index respond_to do |format| format.html { } - format.csv { limit = Setting.issues_export_limit.to_i } + format.csv { limit = Setting.work_packages_export_limit.to_i } end sort_columns = {'id' => "#{CostObject.table_name}.id", diff --git a/app/controllers/costlog_controller.rb b/app/controllers/costlog_controller.rb index 468025ee56..61a8ffe320 100644 --- a/app/controllers/costlog_controller.rb +++ b/app/controllers/costlog_controller.rb @@ -1,7 +1,7 @@ class CostlogController < ApplicationController unloadable - menu_item :issues + menu_item :work_packages before_filter :find_project, :authorize, :only => [:edit, :new, :create, @@ -14,7 +14,7 @@ class CostlogController < ApplicationController helper :sort include SortHelper - helper :issues + helper :work_packages include CostlogHelper include PaginationHelper @@ -23,7 +23,7 @@ class CostlogController < ApplicationController sort_update 'spent_on' => 'spent_on', 'user' => 'user_id', 'project' => "#{Project.table_name}.name", - 'issue' => 'work_package_id', + 'work_package' => 'work_package_id', 'cost_type' => 'cost_type_id', 'units' => 'units', 'costs' => 'costs' @@ -31,11 +31,11 @@ class CostlogController < ApplicationController cond = ARCondition.new if @project.nil? cond << Project.allowed_to_condition(User.current, :view_cost_entries) - elsif @issue.nil? - cond << @project.project_condition(Setting.display_subprojects_issues?) + elsif @work_package.nil? + cond << @project.project_condition(Setting.display_subprojects_work_packages?) else - root_cond = "#{WorkPackage.table_name}.root_id #{(@issue.root_id.nil?) ? "IS NULL" : "= #{@issue.root_id}"}" - cond << "#{root_cond} AND #{Issue.table_name}.lft >= #{@issue.lft} AND #{Issue.table_name}.rgt <= #{@issue.rgt}" + root_cond = "#{WorkPackage.table_name}.root_id #{(@work_package.root_id.nil?) ? "IS NULL" : "= #{@work_package.root_id}"}" + cond << "#{root_cond} AND #{WorkPackage.table_name}.lft >= #{@work_package.lft} AND #{WorkPackage.table_name}.rgt <= #{@work_package.rgt}" end cond << Project.allowed_to_condition(User.current, :view_cost_entries, :project => @project) @@ -135,12 +135,12 @@ private if params[:id] @cost_entry = CostEntry.find(params[:id]) @project = @cost_entry.project - elsif params[:issue_id] - @issue = Issue.find(params[:issue_id]) - @project = @issue.project elsif params[:work_package_id] - @issue = WorkPackage.find(params[:work_package_id]) - @project = @issue.project + @work_package = WorkPackage.find(params[:work_package_id]) + @project = @work_package.project + elsif params[:work_package_id] + @work_package = WorkPackage.find(params[:work_package_id]) + @project = @work_package.project elsif params[:project_id] @project = Project.find(params[:project_id]) else @@ -152,12 +152,12 @@ private end def find_optional_project - if !params[:issue_id].blank? - @issue = Issue.find(params[:issue_id]) - @project = @issue.project + if !params[:work_package_id].blank? + @work_package = WorkPackage.find(params[:work_package_id]) + @project = @work_package.project elsif !params[:work_package_id].blank? - @issue = WorkPackage.find(params[:work_package_id]) - @project = @issue.project + @work_package = WorkPackage.find(params[:work_package_id]) + @project = @work_package.project elsif !params[:project_id].blank? @project = Project.find(params[:project_id]) end @@ -173,10 +173,10 @@ private @cost_entry.user : User.find_by_id(user_id) - issue_id = params[:cost_entry].delete(:work_package_id) - @issue = @cost_entry.present? && @cost_entry.work_package_id == issue_id ? + work_package_id = params[:cost_entry].delete(:work_package_id) + @work_package = @cost_entry.present? && @cost_entry.work_package_id == work_package_id ? @cost_entry.work_package : - WorkPackage.find_by_id(issue_id) + WorkPackage.find_by_id(work_package_id) cost_type_id = params[:cost_entry].delete(:cost_type_id) @cost_type = @cost_entry.present? && @cost_entry.cost_type_id == cost_type_id ? @@ -233,7 +233,7 @@ private def new_default_cost_entry @cost_entry = CostEntry.new.tap do |ce| ce.project = @project - ce.work_package = @issue + ce.work_package = @work_package ce.user = User.current ce.spent_on = Date.today # notice that cost_type is set to default cost_type in the model @@ -242,7 +242,7 @@ private def update_cost_entry_from_params @cost_entry.user = @user - @cost_entry.work_package = @issue + @cost_entry.work_package = @work_package @cost_entry.cost_type = @cost_type @cost_entry.attributes = permitted_params.cost_entry diff --git a/app/helpers/costlog_helper.rb b/app/helpers/costlog_helper.rb index 3ea4157a89..cc2ed787df 100644 --- a/app/helpers/costlog_helper.rb +++ b/app/helpers/costlog_helper.rb @@ -3,9 +3,9 @@ module CostlogHelper def render_costlog_breadcrumb links = [] - links << link_to(l(:label_project_all), {:project_id => nil, :issue_id => nil}) - links << link_to(h(@project), {:project_id => @project, :issue_id => nil}) if @project - links << link_to_issue(@issue, :subject => false) if @issue + links << link_to(l(:label_project_all), {:project_id => nil, :work_package_id => nil}) + links << link_to(h(@project), {:project_id => @project, :work_package_id => nil}) if @project + links << link_to_work_package(@work_package, :subject => false) if @work_package breadcrumb links end diff --git a/app/models/cost_object.rb b/app/models/cost_object.rb index 9bc1307b24..a7bb3a0fea 100644 --- a/app/models/cost_object.rb +++ b/app/models/cost_object.rb @@ -55,16 +55,16 @@ class CostObject < ActiveRecord::Base self[:type] = type end - # Assign all the issues with +version_id+ to this Cost Object - def assign_issues_by_version(version_id) + # Assign all the work_packages with +version_id+ to this Cost Object + def assign_work_packages_by_version(version_id) version = Version.find_by_id(version_id) - return 0 if version.nil? || version.fixed_issues.blank? + return 0 if version.nil? || version.fixed_work_packages.blank? - version.fixed_issues.each do |issue| - issue.update_attribute(:cost_object_id, self.id) + version.fixed_work_packages.each do |work_package| + work_package.update_attribute(:cost_object_id, self.id) end - return version.fixed_issues.size + return version.fixed_work_packages.size end # Change the Cost Object type to another type. Valid types are diff --git a/app/views/cost_objects/_show_variable_cost_object.html.erb b/app/views/cost_objects/_show_variable_cost_object.html.erb index 92ae5533c0..a563ffba13 100644 --- a/app/views/cost_objects/_show_variable_cost_object.html.erb +++ b/app/views/cost_objects/_show_variable_cost_object.html.erb @@ -28,13 +28,13 @@

<%= l(:caption_material_costs) %>

- + - <% @cost_object.cost_entries.visible(User.current, @project).all(:include => [:cost_type]).group_by(&:work_package).each do |issue, cost_entries| + <% @cost_object.cost_entries.visible(User.current, @project).all(:include => [:cost_type]).group_by(&:work_package).each do |work_package, cost_entries| entries = cost_entries.inject(Hash.new) do |results, entry| result = results[entry.cost_type.id.to_s] unless result @@ -50,8 +50,8 @@ entries.each do |c| %> - - + + @@ -103,13 +103,13 @@

<%= l(:caption_labor_costs) %>

<%= CostEntry.human_attribute_name(:issue)%><%= CostEntry.human_attribute_name(:work_package)%> <%= CostEntry.human_attribute_name(:units) %> <%= CostEntry.human_attribute_name(:cost_type) %> <%= CostEntry.human_attribute_name(:costs) %>
<%= link_to_issue issue %><%= link_to pluralize(c.units, c.cost_type.unit, c.cost_type.unit_plural), {:controller => "/costlog", :action => "index", :cost_type_id => c.cost_type, :issue_id => issue} %><%= link_to_work_package work_package %><%= link_to pluralize(c.units, c.cost_type.unit, c.cost_type.unit_plural), {:controller => "/costlog", :action => "index", :cost_type_id => c.cost_type, :work_package_id => work_package} %> <%= c.cost_type %> <%= c.costs_visible_by?(User.current) ? number_to_currency(c.real_costs) : "" %>
- + - <% @cost_object.time_entries.visible(User.current, @project).all.group_by(&:work_package).each do |issue, time_entries| + <% @cost_object.time_entries.visible(User.current, @project).all.group_by(&:work_package).each do |work_package, time_entries| entries = time_entries.inject(Hash.new) do |results, entry| result = results[entry.user.id.to_s] unless result @@ -126,8 +126,8 @@ entries.each do |t| %> - - + + diff --git a/app/views/costlog/_list.html.erb b/app/views/costlog/_list.html.erb index 3073647451..23ded9d939 100644 --- a/app/views/costlog/_list.html.erb +++ b/app/views/costlog/_list.html.erb @@ -4,7 +4,7 @@ <%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %> <%= sort_header_tag('user', :caption => Member.model_name.human) %> <%= sort_header_tag('project', :caption => Project.model_name.human )%> - <%= sort_header_tag('issue', :caption => Issue.model_name.human, :default_order => 'desc') %> + <%= sort_header_tag('work_package', :caption => WorkPackage.model_name.human, :default_order => 'desc') %> <%= sort_header_tag('units', :caption => l(:label_units)) %> <%= sort_header_tag('costs', :caption => l(:label_overall_costs)) %> @@ -19,7 +19,7 @@ diff --git a/app/views/costlog/index.html.erb b/app/views/costlog/index.html.erb index 732790d4c1..fd3f5d5940 100644 --- a/app/views/costlog/index.html.erb +++ b/app/views/costlog/index.html.erb @@ -1,15 +1,15 @@ <%= render :partial => 'shared/costs_header' %>
-<%= link_to_if_authorized l(:button_log_costs), {:controller => '/costlog', :action => 'edit', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-pieces' %> +<%= link_to_if_authorized l(:button_log_costs), {:controller => '/costlog', :action => 'edit', :project_id => @project, :work_package_id => @work_package}, :class => 'icon icon-pieces' %>
<%= render_costlog_breadcrumb %> -

<%= Issue.human_attribute_name(:spent_costs) %>

+

<%= WorkPackage.human_attribute_name(:spent_costs) %>

<%= form_remote_tag( :url => {}, :method => :get, :update => 'content' ) do %> <%= hidden_field_tag('project_id', params[:project_id]) if @project %> -<%= hidden_field_tag 'issue_id', params[:issue_id] if @issue %> +<%= hidden_field_tag 'work_package_id', params[:work_package_id] if @work_package %> <%= hidden_field_tag 'cost_type_id', params[:cost_type_id] if @cost_type %> <%= render :partial => 'date_range' %> <% end %> @@ -19,8 +19,8 @@ <%= pagination_links_full @entries %> <% end %> -<% html_title Issue.human_attribute_name(:spent_costs), l(:label_details) %> +<% html_title WorkPackage.human_attribute_name(:spent_costs), l(:label_details) %> <% content_for :header_tags do %> - <%= auto_discovery_link_tag(:atom, {:issue_id => @issue, :format => 'atom', :key => User.current.rss_key}, :title => Issue.human_attribute_name(:spent_costs)) %> + <%= auto_discovery_link_tag(:atom, {:work_package_id => @work_package, :format => 'atom', :key => User.current.rss_key}, :title => WorkPackage.human_attribute_name(:spent_costs)) %> <% end %> diff --git a/app/views/hooks/_view_issues_context_menu_end.html.erb b/app/views/hooks/_view_issues_context_menu_end.html.erb deleted file mode 100644 index 58b7a047b8..0000000000 --- a/app/views/hooks/_view_issues_context_menu_end.html.erb +++ /dev/null @@ -1,24 +0,0 @@ -<% if not project.nil? and project.module_enabled? :costs_module %> -<% -cost_objects_any = false -possible_cost_objects = issues.inject(issues.first.project.cost_objects) do |intersect, issue| - cost_objects_any |= issue.project.cost_objects.any? - issue.project.cost_objects & intersect -end -%> -
  • - <%= l(:label_cost_object) %> - -
    • -<% end %> diff --git a/app/views/hooks/_view_issues_bulk_edit_details_bottom.html.erb b/app/views/hooks/_view_work_packages_bulk_edit_details_bottom.html.erb similarity index 100% rename from app/views/hooks/_view_issues_bulk_edit_details_bottom.html.erb rename to app/views/hooks/_view_work_packages_bulk_edit_details_bottom.html.erb diff --git a/app/views/hooks/_view_work_packages_context_menu_end.html.erb b/app/views/hooks/_view_work_packages_context_menu_end.html.erb new file mode 100644 index 0000000000..d1e16efd11 --- /dev/null +++ b/app/views/hooks/_view_work_packages_context_menu_end.html.erb @@ -0,0 +1,24 @@ +<% if not project.nil? and project.module_enabled? :costs_module %> +<% +cost_objects_any = false +possible_cost_objects = work_packages.inject(work_packages.first.project.cost_objects) do |intersect, work_package| + cost_objects_any |= work_package.project.cost_objects.any? + work_package.project.cost_objects & intersect +end +%> +
  • + <%= l(:label_cost_object) %> + +
    • +<% end %> diff --git a/app/views/hooks/_view_issues_form_details_bottom.html.erb b/app/views/hooks/_view_work_packages_form_details_bottom.html.erb similarity index 100% rename from app/views/hooks/_view_issues_form_details_bottom.html.erb rename to app/views/hooks/_view_work_packages_form_details_bottom.html.erb diff --git a/app/views/hooks/_view_issues_move_bottom.html.erb b/app/views/hooks/_view_work_packages_move_bottom.html.erb similarity index 100% rename from app/views/hooks/_view_issues_move_bottom.html.erb rename to app/views/hooks/_view_work_packages_move_bottom.html.erb diff --git a/app/views/hooks/_view_issues_show_details_bottom.html.erb b/app/views/hooks/_view_work_packages_show_details_bottom.html.erb similarity index 83% rename from app/views/hooks/_view_issues_show_details_bottom.html.erb rename to app/views/hooks/_view_work_packages_show_details_bottom.html.erb index 0ffdbf8d5f..147ba9b674 100644 --- a/app/views/hooks/_view_issues_show_details_bottom.html.erb +++ b/app/views/hooks/_view_work_packages_show_details_bottom.html.erb @@ -1,11 +1,11 @@ -<% if @project.module_enabled? :costs_module && @issue%> +<% if @project.module_enabled? :costs_module && @work_package%> <%# Only render this partial, if the plugin is enabled for the current project %> - <% attributes_array = cost_issues_attributes(@issue) %> + <% attributes_array = cost_work_packages_attributes(@work_package) %> <% (0..(attributes_array.size - 1)).step(2) do |i| %>
    <%= TimeEntry.human_attribute_name(:issue) %><%= TimeEntry.human_attribute_name(:work_package) %> <%= TimeEntry.human_attribute_name(:hours) %> <%= TimeEntry.human_attribute_name(:user) %> <%= TimeEntry.human_attribute_name(:costs) %>
    <%= link_to_issue issue %><%= link_to "#{t.hours}h", {:controller => "/timelog", :action => "index", :issue_id => issue} %><%= link_to_work_package work_package %><%= link_to "#{t.hours}h", {:controller => "/timelog", :action => "index", :work_package_id => work_package} %> <%=h t.user.name %> <%= number_to_currency(t.real_costs) %>
    <%= CostEntry.human_attribute_name(:comment) %><%=h entry.project %> <% if entry.work_package -%> - <%= link_to_issue entry.work_package -%> + <%= link_to_work_package entry.work_package -%> <% end -%>
    diff --git a/app/views/issues/_action_menu.html.erb b/app/views/issues/_action_menu.html.erb deleted file mode 100644 index ff30d3201d..0000000000 --- a/app/views/issues/_action_menu.html.erb +++ /dev/null @@ -1,19 +0,0 @@ -<% content_for :action_menu_main do %> - <%= li_unless_nil(link_to_if_authorized(l(:button_update), { :controller => '/issues', - :action => 'edit', - :id => @issue }, - :class => 'edit icon icon-edit', - :accesskey => accesskey(:edit))) %> - <%= li_unless_nil(watcher_link(@issue, - User.current, - { :class => 'watcher_link', - :replace => User.current.allowed_to?(:view_issue_watchers, @project) ? ['#watchers', '.watcher_link'] : ['.watcher_link'] })) %> -<% end %> -<% content_for :action_menu_more do %> - <%= li_unless_nil(link_to_if_authorized l(:button_log_time), {:controller => '/timelog', :action => 'new', :issue_id => @issue}, :class => 'icon icon-time-add') %> - <%= li_unless_nil(link_to_if_authorized l(:button_log_costs), {:controller => '/costlog', :action => 'new', :issue_id => @issue}, :class => 'icon icon-pieces') %> - <%= li_unless_nil(link_to_if_authorized l(:button_duplicate), {:controller => '/issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-duplicate') %> - <%= li_unless_nil(link_to_if_authorized l(:button_copy), {:controller => '/issue_moves', :action => 'new', :id => @issue, :copy_options => {:copy => 't'}}, :class => 'icon icon-copy') %> - <%= li_unless_nil(link_to_if_authorized l(:button_move), {:controller => '/issue_moves', :action => 'new', :id => @issue}, :class => 'icon icon-move') %> - <%= li_unless_nil(link_to_if_authorized l(:button_delete), {:controller => '/issues', :action => 'destroy', :id => @issue}, :confirm => (@issue.leaf? ? l(:text_are_you_sure) : l(:text_are_you_sure_with_children)), :method => :post, :class => 'icon icon-del') %> -<% end %> diff --git a/app/views/work_packages/_action_menu.html.erb b/app/views/work_packages/_action_menu.html.erb new file mode 100644 index 0000000000..af1d03ae79 --- /dev/null +++ b/app/views/work_packages/_action_menu.html.erb @@ -0,0 +1,19 @@ +<% content_for :action_menu_main do %> + <%= li_unless_nil(link_to_if_authorized(l(:button_update), { :controller => '/work_packages', + :action => 'edit', + :id => @work_package }, + :class => 'edit icon icon-edit', + :accesskey => accesskey(:edit))) %> + <%= li_unless_nil(watcher_link(@work_package, + User.current, + { :class => 'watcher_link', + :replace => User.current.allowed_to?(:view_work_package_watchers, @project) ? ['#watchers', '.watcher_link'] : ['.watcher_link'] })) %> +<% end %> +<% content_for :action_menu_more do %> + <%= li_unless_nil(link_to_if_authorized l(:button_log_time), {:controller => '/timelog', :action => 'new', :work_package_id => @work_package}, :class => 'icon icon-time-add') %> + <%= li_unless_nil(link_to_if_authorized l(:button_log_costs), {:controller => '/costlog', :action => 'new', :work_package_id => @work_package}, :class => 'icon icon-pieces') %> + <%= li_unless_nil(link_to_if_authorized l(:button_duplicate), {:controller => '/work_packages', :action => 'new', :project_id => @project, :copy_from => @work_package }, :class => 'icon icon-duplicate') %> + <%= li_unless_nil(link_to_if_authorized l(:button_copy), {:controller => '/work_package_moves', :action => 'new', :id => @work_package, :copy_options => {:copy => 't'}}, :class => 'icon icon-copy') %> + <%= li_unless_nil(link_to_if_authorized l(:button_move), {:controller => '/work_package_moves', :action => 'new', :id => @work_package}, :class => 'icon icon-move') %> + <%= li_unless_nil(link_to_if_authorized l(:button_delete), {:controller => '/work_packages', :action => 'destroy', :id => @work_package}, :confirm => (@work_package.leaf? ? l(:text_are_you_sure) : l(:text_are_you_sure_with_children)), :method => :post, :class => 'icon icon-del') %> +<% end %> diff --git a/app/views/issues/destroy.html.erb b/app/views/work_packages/destroy.html.erb similarity index 94% rename from app/views/issues/destroy.html.erb rename to app/views/work_packages/destroy.html.erb index 7d134048ae..2212beeac6 100644 --- a/app/views/issues/destroy.html.erb +++ b/app/views/work_packages/destroy.html.erb @@ -1,7 +1,7 @@

    <%= l(:label_confirmation) %>

    <%= form_tag do %> -<%= @issues.collect {|i| hidden_field_tag 'ids[]', i.id } %> +<%= @work_packages.collect {|i| hidden_field_tag 'ids[]', i.id } %>

    <%= if @hours > 0 && !@entries.blank? diff --git a/config/locales/de.yml b/config/locales/de.yml index c729961f2e..238343c027 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -3,7 +3,7 @@ de: activerecord: attributes: cost_entry: - issue: "Ticket" + work_package: "Ticket" work_package: "Arbeitspacket" overridden_costs: "Überschriebene Kosten" spent: "Gebucht" @@ -24,7 +24,7 @@ de: cost_type: unit: "Einheit" unit_plural: "Einheit plural" - issue: + work_package: cost_object_subject: "Budgettitel" labor_costs: "Personaleinzelkosten" material_costs: "Stückkosten" @@ -121,7 +121,7 @@ de: label_group_by_add: "Gruppierungsfeld hinzufügen" label_hourly_rate: "Stundensatz" label_include_deleted: "Gelöschte anzeigen" - label_issue_filter_add: "Ticketfilter hinzufügen" + label_work_package_filter_add: "Ticketfilter hinzufügen" label_kind: "Art" label_less_or_equal: "<=" label_log_costs: "Stückkosten buchen" diff --git a/config/locales/en.yml b/config/locales/en.yml index ff7b6e0e92..231feefef8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3,7 +3,7 @@ en: activerecord: attributes: cost_entry: - issue: "Issue" + work_package: "WorkPackage" work_package: "Work package" overridden_costs: "Overridden costs" spent: "Spent" @@ -24,7 +24,7 @@ en: cost_type: unit: "Unit Name" unit_plural: "Pluralized Unit Name" - issue: + work_package: cost_object_subject: "Budget title" labor_costs: "Labor costs" material_costs: "Unit costs" @@ -121,7 +121,7 @@ en: label_group_by_add: "Add grouping field" label_hourly_rate: "Hourly rate" label_include_deleted: "Include deleted" - label_issue_filter_add: "Add issue filter" + label_work_package_filter_add: "Add work package filter" label_kind: "Type" label_less_or_equal: "<=" label_log_costs: "Log unit costs" @@ -138,7 +138,7 @@ en: label_view_all_cost_objects: "View all Budgets" label_yes: "Yes" - notice_cost_object_conflict: "Issues must be of the same project." + notice_cost_object_conflict: "WorkPackages must be of the same project." notice_no_cost_objects_available: "No budgets available." notice_something_wrong: "Something went wrong. Please try again." notice_successful_restore: "Successful restore." @@ -161,10 +161,10 @@ en: text_assign_time_and_cost_entries_to_project: "Assign reported hours and costs to the project" text_cost_object_change_type_confirmation: "Are you sure? This operation will destroy information of the specific budget type." - text_destroy_cost_entries_question: "%{cost_entries} were reported on the issues you are about to delete. What do you want to do ?" + text_destroy_cost_entries_question: "%{cost_entries} were reported on the work packages you are about to delete. What do you want to do ?" text_destroy_time_and_cost_entries: "Delete reported hours and costs" - text_destroy_time_and_cost_entries_question: "%{hours} hours, %{cost_entries} were reported on the issues you are about to delete. What do you want to do ?" - text_reassign_time_and_cost_entries: "Reassign reported hours and costs to this issue:" + text_destroy_time_and_cost_entries_question: "%{hours} hours, %{cost_entries} were reported on the work packages you are about to delete. What do you want to do ?" + text_reassign_time_and_cost_entries: "Reassign reported hours and costs to this work package:" text_warning_hidden_elements: "Some entries may have been excluded from the aggregation." week: "week" diff --git a/features/credit_unit_costs.feature b/features/credit_unit_costs.feature index 70821ffff9..7ad5576e13 100644 --- a/features/credit_unit_costs.feature +++ b/features/credit_unit_costs.feature @@ -2,11 +2,11 @@ Feature: Credit unit costs Background: Given there is a standard cost control project named "project1" - And the project "project1" has 1 issue with the following: - | subject | issue1 | + And the project "project1" has 1 work_package with the following: + | subject | work_package1 | And the role "Manager" may have the following rights: - | view_issues | - | edit_issues | + | view_work_packages | + | edit_work_packages | | view_work_packages | | edit_work_packages | | log_costs | @@ -16,11 +16,11 @@ Feature: Credit unit costs | unit_plural | multi_unit | @javascript - Scenario: Crediting units costs to an issue + Scenario: Crediting units costs to an work_package When I am already logged in as "manager" - And I go to the page of the issue "issue1" + And I go to the page of the work_package "work_package1" And I select "Log unit costs" from the action menu And I fill in "cost_entry_units" with "100" And I select "cost_type_1" from "Cost type" And I press "Save" - Then I should be on the page of the issue "issue1" + Then I should be on the page of the work_package "work_package1" diff --git a/features/step_definitions/cost_steps.rb b/features/step_definitions/cost_steps.rb index a739764c86..d0d7677a66 100755 --- a/features/step_definitions/cost_steps.rb +++ b/features/step_definitions/cost_steps.rb @@ -3,7 +3,7 @@ Given /^the project "([^\"]+)" has (\d+) [Cc]ost(?: )?[Ee]ntr(?:ies|y)$/ do |pro as_admin count do ce = CostEntry.generate ce.project = p - ce.work_package = Issue.generate_for_project!(p) + ce.work_package = WorkPackage.generate_for_project!(p) ce.save! end end @@ -34,7 +34,7 @@ end Given /^the [Uu]ser "([^\"]*)" has (\d+) [Cc]ost(?: )?[Ee]ntr(?:ies|y)$/ do |user, count| u = User.find_by_login user p = u.projects.last - i = Issue.generate_for_project!(p) + i = WorkPackage.generate_for_project!(p) as_admin count do ce = FactoryGirl.create(:cost_entry) ce.user = u @@ -46,7 +46,7 @@ end Given /^the project "([^\"]+)" has (\d+) [Cc]ost(?: )?[Ee]ntr(?:ies|y) with the following:$/ do |project, count, table| p = Project.find_by_name(project) || Project.find_by_identifier(project) - i = Issue.generate_for_project!(p) + i = WorkPackage.generate_for_project!(p) as_admin count do ce = CostEntry.generate ce.project = p @@ -56,8 +56,8 @@ Given /^the project "([^\"]+)" has (\d+) [Cc]ost(?: )?[Ee]ntr(?:ies|y) with the end end -Given /^the issue "([^\"]+)" has (\d+) [Cc]ost(?: )?[Ee]ntr(?:ies|y) with the following:$/ do |issue, count, table| - i = Issue.find(:last, :conditions => ["subject = '#{issue}'"]) +Given /^the work_package "([^\"]+)" has (\d+) [Cc]ost(?: )?[Ee]ntr(?:ies|y) with the following:$/ do |work_package, count, table| + i = WorkPackage.find(:last, :conditions => ["subject = '#{work_package}'"]) as_admin count do ce = FactoryGirl.build(:cost_entry, :spent_on => (table.rows_hash["date"] ? table.rows_hash["date"].to_date : Date.today), :units => table.rows_hash["units"], @@ -81,12 +81,12 @@ Given /^there is a standard cost control project named "([^\"]*)"$/ do |name| | name | | tracker1 | And the project "#{name}" has 1 subproject - And the project "#{name}" has 1 issue with: - | subject | #{name}issue | + And the project "#{name}" has 1 work_package with: + | subject | #{name}work_package | And there is a role "Manager" And the role "Manager" may have the following rights: | view_own_hourly_rate | - | view_issues | + | view_work_packages | | view_work_packages | | view_own_time_entries | | view_own_cost_entries | @@ -99,7 +99,7 @@ Given /^there is a standard cost control project named "([^\"]*)"$/ do |name| | View own cost entries | And there is a role "Reporter" And the role "Reporter" may have the following rights: - | Create issues | + | Create work_packages | And there is a role "Supplier" And the role "Supplier" may have the following rights: | View own hourly rate | @@ -119,21 +119,21 @@ Given /^there is a standard cost control project named "([^\"]*)"$/ do |name| } end -Given /^users have times and the cost type "([^\"]*)" logged on the issue "([^\"]*)" with:$/ do |cost_type, issue, table| - i = Issue.find(:last, :conditions => ["subject = '#{issue}'"]) - raise "No such issue: #{issue}" unless i +Given /^users have times and the cost type "([^\"]*)" logged on the work_package "([^\"]*)" with:$/ do |cost_type, work_package, table| + i = WorkPackage.find(:last, :conditions => ["subject = '#{work_package}'"]) + raise "No such work_package: #{work_package}" unless i table.rows_hash.collect do |k,v| user = k.split.first if k.end_with? "hours" steps %Q{ - And the issue "#{issue}" has 1 time entry with the following: + And the work_package "#{work_package}" has 1 time entry with the following: | hours | #{v} | | user | #{user} | } elsif k.end_with? "units" steps %Q{ - And the issue "#{issue}" has 1 cost entry with the following: + And the work_package "#{work_package}" has 1 cost entry with the following: | units | #{v} | | user | #{user} | | cost type | #{cost_type} | diff --git a/features/view_own_rates.feature b/features/view_own_rates.feature index 9d0a1eb164..da8cbab536 100644 --- a/features/view_own_rates.feature +++ b/features/view_own_rates.feature @@ -5,7 +5,7 @@ Feature: Permission View Own hourly and cost rates Given there is a standard cost control project named "Standard Project" And the role "Supplier" may have the following rights: | view_own_hourly_rate | - | view_issues | + | view_work_packages | | view_work_packages | | view_own_time_entries | | view_own_cost_entries | @@ -17,29 +17,29 @@ Feature: Permission View Own hourly and cost rates | Lastname | Bobbit | | default rate | 10.00 | And the user "testuser" is a "Supplier" in the project "Standard Project" - And the project "Standard Project" has 1 issue with the following: - | subject | test_issue | - And the issue "test_issue" has 1 time entry with the following: + And the project "Standard Project" has 1 work_package with the following: + | subject | test_work_package | + And the work_package "test_work_package" has 1 time entry with the following: | hours | 1.00 | | user | testuser | And there is 1 cost type with the following: | name | Translation | | cost rate | 7.00 | - And the issue "test_issue" has 1 cost entry with the following: + And the work_package "test_work_package" has 1 cost entry with the following: | units | 2.00 | | user | testuser | | cost type | Translation | And the user "manager" has: | hourly rate | 11.00 | - And the issue "test_issue" has 1 time entry with the following: + And the work_package "test_work_package" has 1 time entry with the following: | hours | 3.00 | | user | manager | - And the issue "test_issue" has 1 cost entry with the following: + And the work_package "test_work_package" has 1 cost entry with the following: | units | 5.00 | | user | manager | | cost type | Translation | And I am already logged in as "testuser" - And I am on the page for the issue "test_issue" + And I am on the page for the work_package "test_work_package" Then I should see "1.00 hour" And I should see "2.0 Translations" And I should see "24.00 EUR" @@ -47,7 +47,7 @@ Feature: Permission View Own hourly and cost rates And I should not see "35.00 EUR" # material costs only of Manager And I should not see "43.00 EUR" # labour costs of me and Manager And I should not see "49.00 EUR" # material costs of me and Manager - And I am on the issues page for the project called "Standard Project" + And I am on the work_packages page for the project called "Standard Project" And I toggle the Options fieldset And I select to see columns | Overall costs | diff --git a/lib/open_project/costs/engine.rb b/lib/open_project/costs/engine.rb index 68c65ff3d2..e2adf53d10 100644 --- a/lib/open_project/costs/engine.rb +++ b/lib/open_project/costs/engine.rb @@ -10,7 +10,7 @@ module OpenProject::Costs initializer "costs.register_hooks" do require 'open_project/costs/hooks' - require 'open_project/costs/hooks/issue_hook' + require 'open_project/costs/hooks/work_package_hook' require 'open_project/costs/hooks/project_hook' require 'open_project/costs/hooks/work_package_action_menu' end @@ -32,7 +32,7 @@ module OpenProject::Costs initializer 'costs.register_observers' do |app| # Observers - ActiveRecord::Base.observers.push :rate_observer, :default_hourly_rate_observer, :costs_issue_observer + ActiveRecord::Base.observers.push :rate_observer, :default_hourly_rate_observer, :costs_work_package_observer end config.before_configuration do |app| @@ -66,7 +66,6 @@ module OpenProject::Costs # Model Patches require_dependency 'open_project/costs/patches/work_package_patch' - require_dependency 'open_project/costs/patches/issue_patch' require_dependency 'open_project/costs/patches/project_patch' require_dependency 'open_project/costs/patches/query_patch' require_dependency 'open_project/costs/patches/user_patch' @@ -76,17 +75,15 @@ module OpenProject::Costs # Controller Patchesopen_project/costs/patches/ require_dependency 'open_project/costs/patches/application_controller_patch' - require_dependency 'open_project/costs/patches/issues_controller_patch' require_dependency 'open_project/costs/patches/work_packages_controller_patch' require_dependency 'open_project/costs/patches/projects_controller_patch' # Helper Patches require_dependency 'open_project/costs/patches/application_helper_patch' require_dependency 'open_project/costs/patches/users_helper_patch' - require_dependency 'open_project/costs/patches/issues_helper_patch' require_dependency 'open_project/costs/patches/work_packages_helper_patch' - require_dependency 'open_project/costs/patches/issue_observer' + require_dependency 'open_project/costs/patches/work_package_observer' # loading the class so that acts_as_journalized gets registered VariableCostObject @@ -178,8 +175,8 @@ module OpenProject::Costs end config.after_initialize do - # We are overwriting issues/_action_menu.html.erb so our view must be found first - IssuesController.view_paths.unshift("#{config.root}/app/views") + # We are overwriting work_packages/_action_menu.html.erb so our view must be found first + WorkPackagesController.view_paths.unshift("#{config.root}/app/views") end end diff --git a/lib/open_project/costs/hooks/issue_hook.rb b/lib/open_project/costs/hooks/work_package_hook.rb similarity index 53% rename from lib/open_project/costs/hooks/issue_hook.rb rename to lib/open_project/costs/hooks/work_package_hook.rb index cfb933dc21..977a389ae9 100644 --- a/lib/open_project/costs/hooks/issue_hook.rb +++ b/lib/open_project/costs/hooks/work_package_hook.rb @@ -1,58 +1,58 @@ -# Hooks to attach to the Redmine Issues. -class OpenProject::Costs::Hooks::IssueHook < Redmine::Hook::ViewListener +# Hooks to attach to the Redmine WorkPackages. +class OpenProject::Costs::Hooks::WorkPackageHook < Redmine::Hook::ViewListener # Renders the Cost Object subject and basic costs information - render_on :view_issues_show_details_bottom, :partial => 'hooks/view_issues_show_details_bottom' + render_on :view_work_packages_show_details_bottom, :partial => 'hooks/view_work_packages_show_details_bottom' # Renders a select tag with all the Cost Objects - render_on :view_issues_form_details_bottom, :partial => 'hooks/view_issues_form_details_bottom' + render_on :view_work_packages_form_details_bottom, :partial => 'hooks/view_work_packages_form_details_bottom' # Renders a select tag with all the Cost Objects for the bulk edit page - render_on :view_issues_bulk_edit_details_bottom, :partial => 'hooks/view_issues_bulk_edit_details_bottom' + render_on :view_work_packages_bulk_edit_details_bottom, :partial => 'hooks/view_work_packages_bulk_edit_details_bottom' - render_on :view_issues_move_bottom, :partial => 'hooks/view_issues_move_bottom' + render_on :view_work_packages_move_bottom, :partial => 'hooks/view_work_packages_move_bottom' - render_on :view_issues_context_menu_end, :partial => 'hooks/view_issues_context_menu_end' + render_on :view_work_packages_context_menu_end, :partial => 'hooks/view_work_packages_context_menu_end' # Updates the cost object after a move # # Context: # * params => Request parameters - # * issue => Issue to move + # * work_package => WorkPackage to move # * target_project => Target of the move - # * copy => true, if the issues are copied rather than moved - def controller_issues_move_before_save(context={}) - # FIXME: In case of copy==true, this will break stuff if the original issue is saved + # * copy => true, if the work_packages are copied rather than moved + def controller_work_packages_move_before_save(context={}) + # FIXME: In case of copy==true, this will break stuff if the original work_package is saved cost_object_id = context[:params] && context[:params][:cost_object_id] case cost_object_id when "" # a.k.a "(No change)" # cost objects HAVE to be changed if move is performed across project boundaries # as the are project specific - context[:issue].cost_object_id = nil unless (context[:issue].project == context[:target_project]) + context[:work_package].cost_object_id = nil unless (context[:work_package].project == context[:target_project]) when "none" - context[:issue].cost_object_id = nil + context[:work_package].cost_object_id = nil else - context[:issue].cost_object_id = cost_object_id + context[:work_package].cost_object_id = cost_object_id end end - # Saves the Cost Object assignment to the issue + # Saves the Cost Object assignment to the work_package # # Context: - # * :issue => Issue being saved + # * :work_package => WorkPackage being saved # * :params => HTML parameters # - def controller_issues_bulk_edit_before_save(context = { }) + def controller_work_packages_bulk_edit_before_save(context = { }) case true when context[:params][:cost_object_id].blank? # Do nothing when context[:params][:cost_object_id] == 'none' # Unassign cost_object - context[:issue].cost_object = nil + context[:work_package].cost_object = nil else - context[:issue].cost_object = CostObject.find(context[:params][:cost_object_id]) + context[:work_package].cost_object = CostObject.find(context[:params][:cost_object_id]) end return '' @@ -64,7 +64,7 @@ class OpenProject::Costs::Hooks::IssueHook < Redmine::Hook::ViewListener # Context: # * :detail => Detail about the journal change # - def helper_issues_show_detail_after_setting(context = { }) + def helper_work_packages_show_detail_after_setting(context = { }) # FIXME: Overwritting the caller is bad juju if (context[:detail].prop_key == 'cost_object_id') if context[:detail].value.to_i.to_s == context[:detail].value.to_s diff --git a/lib/open_project/costs/patches/issue_observer.rb b/lib/open_project/costs/patches/issue_observer.rb deleted file mode 100644 index a4a7d45ebb..0000000000 --- a/lib/open_project/costs/patches/issue_observer.rb +++ /dev/null @@ -1,21 +0,0 @@ -require_dependency 'issue' - -class CostsIssueObserver < ActiveRecord::Observer - unloadable - observe :issue - - def after_update(issue) - if issue.project_id_changed? - # TODO: This only works with the global cost_rates - CostEntry.update_all({:project_id => issue.project_id}, {:work_package_id => issue.id}) - end - end - - def before_update(issue) - # FIXME: remove this method once controller_issues_move_before_save is in 0.9-stable - if issue.project_id_changed? && issue.cost_object_id && !issue.project.cost_object_ids.include?(issue.cost_object_id) - issue.cost_object = nil - end - # true - end -end diff --git a/lib/open_project/costs/patches/issue_patch.rb b/lib/open_project/costs/patches/issue_patch.rb deleted file mode 100644 index 60aed45f9d..0000000000 --- a/lib/open_project/costs/patches/issue_patch.rb +++ /dev/null @@ -1,27 +0,0 @@ -require 'issue' - -module OpenProject::Costs::Patches::IssuePatch - def self.included(base) # :nodoc: - base.extend(ClassMethods) - - base.send(:include, InstanceMethods) - - # Same as typing in the class - base.class_eval do - unloadable - - belongs_to :cost_object, :inverse_of => :work_packages - has_many :cost_entries, :foreign_key => :work_package_id, :dependent => :delete_all - end - end - - module ClassMethods - - end - - module InstanceMethods - - end -end - -Issue.send(:include, OpenProject::Costs::Patches::IssuePatch) diff --git a/lib/open_project/costs/patches/issues_controller_patch.rb b/lib/open_project/costs/patches/issues_controller_patch.rb deleted file mode 100644 index 47b5cce8db..0000000000 --- a/lib/open_project/costs/patches/issues_controller_patch.rb +++ /dev/null @@ -1,77 +0,0 @@ -require_dependency 'issues_controller' - -module OpenProject::Costs::Patches::IssuesControllerPatch - def self.included(base) # :nodoc: - base.send(:include, InstanceMethods) - - base.class_eval do - alias_method_chain :show, :entries - alias_method_chain :destroy, :entries - - helper :issues - end - - end - - module InstanceMethods - # Authorize the user for the requested action - def show_with_entries - @cost_entries = @issue.cost_entries.visible(User.current, @issue.project) - cost_entries_with_rate = @cost_entries.select{|c| c.costs_visible_by?(User.current)} - @material_costs = cost_entries_with_rate.blank? ? nil : cost_entries_with_rate.collect(&:real_costs).sum - - @time_entries = @issue.time_entries.visible(User.current, @issue.project) - time_entries_with_rate = @time_entries.select{|c| c.costs_visible_by?(User.current)} - @labor_costs = time_entries_with_rate.blank? ? nil : time_entries_with_rate.collect(&:real_costs).sum - - unless @material_costs.nil? && @labor_costs.nil? - @overall_costs = 0 - @overall_costs += @material_costs unless @material_costs.nil? - @overall_costs += @labor_costs unless @labor_costs.nil? - else - @overall_costs = nil - end - - show_without_entries - end - - def destroy_with_entries - @entries = CostEntry.all(:conditions => ['work_package_id IN (?)', @issues]) - @hours = TimeEntry.sum(:hours, :conditions => ['work_package_id IN (?)', @issues]).to_f - unless @entries.blank? && @hours == 0 - case params[:todo] - when 'destroy' - # nothing to do - when 'nullify' - TimeEntry.update_all('work_package_id = NULL', ['work_package_id IN (?)', @issues]) - CostEntry.update_all('work_package_id = NULL', ['work_package_id IN (?)', @issues]) - when 'reassign' - reassign_to = @project.work_packages.find_by_id(params[:reassign_to_id]) - if reassign_to.nil? - flash.now[:error] = l(:error_issue_not_found_in_project) - return - else - TimeEntry.update_all("work_package_id = #{reassign_to.id}", ['work_package_id IN (?)', @issues]) - CostEntry.update_all("work_package_id = #{reassign_to.id}", ['work_package_id IN (?)', @issues]) - end - else - # display the destroy form if it's a user request - return unless api_request? - end - end - @issues.each do |issue| - begin - issue.reload.destroy - rescue ::ActiveRecord::RecordNotFound # raised by #reload if issue no longer exists - # nothing to do, issue was already deleted (eg. by a parent) - end - end - respond_to do |format| - format.html { redirect_to :action => 'index', :project_id => @project } - format.api { head :ok } - end - end - end -end - -IssuesController.send(:include, OpenProject::Costs::Patches::IssuesControllerPatch) diff --git a/lib/open_project/costs/patches/issues_helper_patch.rb b/lib/open_project/costs/patches/issues_helper_patch.rb deleted file mode 100644 index 2ba4e664be..0000000000 --- a/lib/open_project/costs/patches/issues_helper_patch.rb +++ /dev/null @@ -1,89 +0,0 @@ -require_dependency 'issues_helper' - -module OpenProject::Costs::Patches::IssuesHelperPatch - def self.included(base) # :nodoc: - base.send(:include, InstanceMethods) - - # Same as typing in the class - base.class_eval do - def summarized_cost_entries(cost_entries, create_link=true) - last_cost_type = "" - - return "-" if cost_entries.blank? - result = cost_entries.sort_by(&:id).inject(Hash.new) do |result, entry| - if entry.cost_type == last_cost_type - result[last_cost_type][:units] += entry.units - else - last_cost_type = entry.cost_type - - result[last_cost_type] = {} - result[last_cost_type][:units] = entry.units - result[last_cost_type][:unit] = entry.cost_type.unit - result[last_cost_type][:unit_plural] = entry.cost_type.unit_plural - end - result - end - - str_array = [] - result.each do |k, v| - txt = pluralize(v[:units], v[:unit], v[:unit_plural]) - if create_link - # TODO why does this have project_id, issue_id and cost_type_id params? - str_array << link_to(txt, { :controller => '/costlog', - :action => 'index', - :project_id => @work_package.project, - :work_package_id => @work_package, - :cost_type_id => k }, - { :title => k.name }) - else - str_array << "#{txt}" - end - end - str_array.join(", ").html_safe - end - - def cost_issues_attributes(work_package) - attributes = [] - - object_value = if work_package.cost_object.nil? - "-" - else - link_to_cost_object(work_package.cost_object) - end - - attributes << [CostObject.model_name.human, object_value] - - if User.current.allowed_to?(:view_time_entries, @project) || - User.current.allowed_to?(:view_own_time_entries, @project) - - #TODO: put inside controller or model - summed_hours = @time_entries.sum(&:hours) - - value = summed_hours > 0 ? - link_to(l_hours(summed_hours), issue_time_entries_path(work_package)) : "-" - - attributes << [Issue.human_attribute_name(:spent_hours), value] - end - - unless @overall_costs.nil? - attributes << [Issue.human_attribute_name(:overall_costs), number_to_currency(@overall_costs)] - end - - - if User.current.allowed_to?(:view_cost_entries, @project) || - User.current.allowed_to?(:view_own_cost_entries, @project) - - attributes << [Issue.human_attribute_name(:spent_units), summarized_cost_entries(@cost_entries)] - end - - attributes - end - end - end - - module InstanceMethods - - end -end - -IssuesHelper.send(:include, OpenProject::Costs::Patches::IssuesHelperPatch) diff --git a/lib/open_project/costs/patches/projects_controller_patch.rb b/lib/open_project/costs/patches/projects_controller_patch.rb index c77e1c8d5e..857f526056 100644 --- a/lib/open_project/costs/patches/projects_controller_patch.rb +++ b/lib/open_project/costs/patches/projects_controller_patch.rb @@ -13,7 +13,7 @@ module OpenProject::Costs::Patches::ProjectsControllerPatch module InstanceMethods def own_total_hours if User.current.allowed_to?(:view_own_time_entries, @project) - cond = @project.project_condition(Setting.display_subprojects_issues?) + cond = @project.project_condition(Setting.display_subprojects_work_packages?) @total_hours = TimeEntry.visible.sum(:hours, :include => :project, :conditions => cond).to_f end end diff --git a/lib/open_project/costs/patches/query_patch.rb b/lib/open_project/costs/patches/query_patch.rb index e1912787a7..50afb15c42 100644 --- a/lib/open_project/costs/patches/query_patch.rb +++ b/lib/open_project/costs/patches/query_patch.rb @@ -6,12 +6,12 @@ module OpenProject::Costs::Patches::QueryPatch include ActionView::Helpers::NumberHelper alias :super_value :value - def value(issue) - number_to_currency(issue.send(name)) + def value(work_package) + number_to_currency(work_package.send(name)) end - def real_value(issue) - super_value issue + def real_value(work_package) + super_value work_package end end diff --git a/lib/open_project/costs/patches/time_entry_patch.rb b/lib/open_project/costs/patches/time_entry_patch.rb index 176ca22243..02afb1490f 100644 --- a/lib/open_project/costs/patches/time_entry_patch.rb +++ b/lib/open_project/costs/patches/time_entry_patch.rb @@ -46,9 +46,9 @@ module OpenProject::Costs::Patches::TimeEntryPatch module ClassMethods def update_all(updates, conditions = nil, options = {}) - # instead of a update_all, perform an individual update during issue#move + # instead of a update_all, perform an individual update during work_package#move # to trigger the update of the costs based on new rates - if conditions.respond_to?(:keys) && conditions.keys == [:issue_id] && updates =~ /^project_id = ([\d]+)$/ + if conditions.respond_to?(:keys) && conditions.keys == [:work_package_id] && updates =~ /^project_id = ([\d]+)$/ project_id = $1 time_entries = TimeEntry.all(:conditions => conditions) time_entries.each do |entry| diff --git a/lib/open_project/costs/patches/version_patch.rb b/lib/open_project/costs/patches/version_patch.rb index 09a30bb292..81218e63cf 100644 --- a/lib/open_project/costs/patches/version_patch.rb +++ b/lib/open_project/costs/patches/version_patch.rb @@ -12,7 +12,7 @@ module OpenProject::Costs::Patches::VersionPatch module InstanceMethods def spent_hours_with_inheritance # overwritten method - @spent_hours ||= TimeEntry.visible.sum(:hours, :include => :work_package, :conditions => ["#{Issue.table_name}.fixed_version_id = ?", id]).to_f + @spent_hours ||= TimeEntry.visible.sum(:hours, :include => :work_package, :conditions => ["#{WorkPackage.table_name}.fixed_version_id = ?", id]).to_f end end end diff --git a/lib/open_project/costs/patches/work_package_observer.rb b/lib/open_project/costs/patches/work_package_observer.rb new file mode 100644 index 0000000000..0f6733568c --- /dev/null +++ b/lib/open_project/costs/patches/work_package_observer.rb @@ -0,0 +1,21 @@ +require_dependency 'work_package' + +class CostsWorkPackageObserver < ActiveRecord::Observer + unloadable + observe :work_package + + def after_update(work_package) + if work_package.project_id_changed? + # TODO: This only works with the global cost_rates + CostEntry.update_all({:project_id => work_package.project_id}, {:work_package_id => work_package.id}) + end + end + + def before_update(work_package) + # FIXME: remove this method once controller_work_packages_move_before_save is in 0.9-stable + if work_package.project_id_changed? && work_package.cost_object_id && !work_package.project.cost_object_ids.include?(work_package.cost_object_id) + work_package.cost_object = nil + end + # true + end +end diff --git a/lib/open_project/costs/patches/work_packages_controller_patch.rb b/lib/open_project/costs/patches/work_packages_controller_patch.rb index c5dc2002f2..d1a2ccd424 100644 --- a/lib/open_project/costs/patches/work_packages_controller_patch.rb +++ b/lib/open_project/costs/patches/work_packages_controller_patch.rb @@ -6,8 +6,9 @@ module OpenProject::Costs::Patches::WorkPackagesControllerPatch base.class_eval do alias_method_chain :show, :entries + alias_method_chain :destroy, :entries - helper :issues + helper :work_packages end end @@ -15,11 +16,11 @@ module OpenProject::Costs::Patches::WorkPackagesControllerPatch module InstanceMethods # Authorize the user for the requested action def show_with_entries - @cost_entries = work_package.cost_entries.visible(User.current, work_package.project) + @cost_entries = @work_package.cost_entries.visible(User.current, @work_package.project) cost_entries_with_rate = @cost_entries.select{|c| c.costs_visible_by?(User.current)} @material_costs = cost_entries_with_rate.blank? ? nil : cost_entries_with_rate.collect(&:real_costs).sum - @time_entries = work_package.time_entries.visible(User.current, work_package.project) + @time_entries = @work_package.time_entries.visible(User.current, @work_package.project) time_entries_with_rate = @time_entries.select{|c| c.costs_visible_by?(User.current)} @labor_costs = time_entries_with_rate.blank? ? nil : time_entries_with_rate.collect(&:real_costs).sum @@ -33,6 +34,43 @@ module OpenProject::Costs::Patches::WorkPackagesControllerPatch show_without_entries end + + def destroy_with_entries + @entries = CostEntry.all(:conditions => ['work_package_id IN (?)', @work_packages]) + @hours = TimeEntry.sum(:hours, :conditions => ['work_package_id IN (?)', @work_packages]).to_f + unless @entries.blank? && @hours == 0 + case params[:todo] + when 'destroy' + # nothing to do + when 'nullify' + TimeEntry.update_all('work_package_id = NULL', ['work_package_id IN (?)', @work_packages]) + CostEntry.update_all('work_package_id = NULL', ['work_package_id IN (?)', @work_packages]) + when 'reassign' + reassign_to = @project.work_packages.find_by_id(params[:reassign_to_id]) + if reassign_to.nil? + flash.now[:error] = l(:error_work_package_not_found_in_project) + return + else + TimeEntry.update_all("work_package_id = #{reassign_to.id}", ['work_package_id IN (?)', @work_packages]) + CostEntry.update_all("work_package_id = #{reassign_to.id}", ['work_package_id IN (?)', @work_packages]) + end + else + # display the destroy form if it's a user request + return unless api_request? + end + end + @work_packages.each do |work_package| + begin + work_package.reload.destroy + rescue ::ActiveRecord::RecordNotFound # raised by #reload if work_package no longer exists + # nothing to do, work_package was already deleted (eg. by a parent) + end + end + respond_to do |format| + format.html { redirect_to :action => 'index', :project_id => @project } + format.api { head :ok } + end + end end end diff --git a/lib/open_project/costs/patches/work_packages_helper_patch.rb b/lib/open_project/costs/patches/work_packages_helper_patch.rb index 5e9f5cbd3b..6da03ad93b 100644 --- a/lib/open_project/costs/patches/work_packages_helper_patch.rb +++ b/lib/open_project/costs/patches/work_packages_helper_patch.rb @@ -19,7 +19,7 @@ module OpenProject::Costs::Patches::WorkPackagesHelperPatch summed_hours = @time_entries.sum(&:hours) summed_hours > 0 ? - link_to(l_hours(summed_hours), issue_time_entries_path(work_package)) : + link_to(l_hours(summed_hours), work_package_time_entries_path(work_package)) : "-" end @@ -47,6 +47,42 @@ module OpenProject::Costs::Patches::WorkPackagesHelperPatch attributes end + def summarized_cost_entries(cost_entries, create_link=true) + last_cost_type = "" + + return "-" if cost_entries.blank? + result = cost_entries.sort_by(&:id).inject(Hash.new) do |result, entry| + if entry.cost_type == last_cost_type + result[last_cost_type][:units] += entry.units + else + last_cost_type = entry.cost_type + + result[last_cost_type] = {} + result[last_cost_type][:units] = entry.units + result[last_cost_type][:unit] = entry.cost_type.unit + result[last_cost_type][:unit_plural] = entry.cost_type.unit_plural + end + result + end + + str_array = [] + result.each do |k, v| + txt = pluralize(v[:units], v[:unit], v[:unit_plural]) + if create_link + # TODO why does this have project_id, work_package_id and cost_type_id params? + str_array << link_to(txt, { :controller => '/costlog', + :action => 'index', + :project_id => @work_package.project, + :work_package_id => @work_package, + :cost_type_id => k }, + { :title => k.name }) + else + str_array << "#{txt}" + end + end + str_array.join(", ").html_safe + end + def work_package_show_attributes_with_costs(work_package) original = work_package_show_attributes_without_costs(work_package) diff --git a/openproject-costs.gemspec b/openproject-costs.gemspec index 61b5361d0f..6eb880fdc4 100644 --- a/openproject-costs.gemspec +++ b/openproject-costs.gemspec @@ -11,7 +11,7 @@ Gem::Specification.new do |s| s.email = "info@finn.de" s.homepage = "http://www.finn.de" s.summary = "A OpenProject plugin to manage costs" - s.description = "This plugin allows to track labor and units cost associated with issues." + s.description = "This plugin allows to track labor and units cost associated with work packages." s.files = Dir["{app,config,db,lib}/**/*", "Rakefile", "README.rdoc"] s.test_files = Dir["spec/**/*"] diff --git a/spec/controllers/costlog_controller_spec.rb b/spec/controllers/costlog_controller_spec.rb index f5fc767137..cb314cedc6 100644 --- a/spec/controllers/costlog_controller_spec.rb +++ b/spec/controllers/costlog_controller_spec.rb @@ -3,21 +3,21 @@ require File.expand_path(File.dirname(__FILE__) + "/../spec_helper.rb") describe CostlogController do include Cost::PluginSpecHelper let (:project) { FactoryGirl.create(:project_with_trackers) } - let (:issue) { FactoryGirl.create(:issue, :project => project, + let (:work_package) { FactoryGirl.create(:work_package, :project => project, :author => user, :tracker => project.trackers.first) } let (:user) { FactoryGirl.create(:user) } let (:user2) { FactoryGirl.create(:user) } let (:controller) { FactoryGirl.build(:role, :permissions => [:log_costs, :edit_cost_entries]) } let (:cost_type) { FactoryGirl.build(:cost_type) } - let (:cost_entry) { FactoryGirl.build(:cost_entry, :work_package => issue, + let (:cost_entry) { FactoryGirl.build(:cost_entry, :work_package => work_package, :project => project, :spent_on => Date.today, :overridden_costs => 400, :units => 100, :user => user, :comments => "") } - let(:issue_status) { FactoryGirl.create(:issue_status, :is_default => true) } + let(:work_package_status) { FactoryGirl.create(:work_package_status, :is_default => true) } def grant_current_user_permissions user, permissions member = FactoryGirl.build(:member, :project => project, @@ -35,7 +35,7 @@ describe CostlogController do shared_examples_for "assigns" do it { assigns(:cost_entry).project.should == expected_project } - it { assigns(:cost_entry).work_package.should == expected_issue } + it { assigns(:cost_entry).work_package.should == expected_work_package } it { assigns(:cost_entry).user.should == expected_user } it { assigns(:cost_entry).spent_on.should == expected_spent_on } it { assigns(:cost_entry).cost_type.should == expected_cost_type } @@ -53,10 +53,10 @@ describe CostlogController do end describe "GET new" do - let(:params) { { "work_package_id" => issue.id.to_s } } + let(:params) { { "work_package_id" => work_package.id.to_s } } let(:expected_project) { project } - let(:expected_issue) { issue } + let(:expected_work_package) { work_package } let(:expected_user) { user } let(:expected_spent_on) { Date.today } let(:expected_cost_type) { nil } @@ -200,7 +200,7 @@ describe CostlogController do grant_current_user_permissions user, [:edit_cost_entries] cost_entry.project = FactoryGirl.create(:project_with_trackers) - cost_entry.work_package = FactoryGirl.create(:issue, :project => cost_entry.project, + cost_entry.work_package = FactoryGirl.create(:work_package, :project => cost_entry.project, :tracker => cost_entry.project.trackers.first, :author => user) cost_entry.save! @@ -226,14 +226,14 @@ describe CostlogController do describe "POST create" do let (:params) { { "project_id" => project.id.to_s, "cost_entry" => { "user_id" => user.id.to_s, - "work_package_id" => (issue.present? ? issue.id.to_s : "") , + "work_package_id" => (work_package.present? ? work_package.id.to_s : "") , "units" => units.to_s, "cost_type_id" => (cost_type.present? ? cost_type.id.to_s : "" ), "comments" => "lorem", "spent_on" => date.to_s, "overridden_costs" => overridden_costs.to_s } } } let(:expected_project) { project } - let(:expected_issue) { issue } + let(:expected_work_package) { work_package } let(:expected_user) { user } let(:expected_overridden_costs) { overridden_costs } let(:expected_spent_on) { date } @@ -254,7 +254,7 @@ describe CostlogController do post :create, params end - # is this really usefull, shouldn't it redirect to the creating issue by default? + # is this really usefull, shouldn't it redirect to the creating work_package by default? it { response.should redirect_to(:controller => "costlog", :action => "index", :project_id => project) } it { assigns(:cost_entry).should_not be_new_record } it_should_behave_like "assigns" @@ -409,27 +409,27 @@ describe CostlogController do end describe "WHEN the user is allowed to create cost_entries - WHEN the id of an issue not included in the provided project is provided" do + WHEN the id of an work_package not included in the provided project is provided" do let(:project2) { FactoryGirl.create(:project_with_trackers) } - let(:issue2) { FactoryGirl.create(:issue, :project => project2, + let(:work_package2) { FactoryGirl.create(:work_package, :project => project2, :tracker => project2.trackers.first, :author => user) } - let(:expected_issue) { issue2 } + let(:expected_work_package) { work_package2 } before do grant_current_user_permissions user, [:log_costs] - params["cost_entry"]["work_package_id"] = issue2.id + params["cost_entry"]["work_package_id"] = work_package2.id end it_should_behave_like "invalid create" end describe "WHEN the user is allowed to create cost_entries - WHEN no issue_id is provided" do + WHEN no work_package_id is provided" do - let(:expected_issue) { nil } + let(:expected_work_package) { nil } before do grant_current_user_permissions user, [:log_costs] @@ -476,7 +476,7 @@ describe CostlogController do cost_entry.save(:validate => false) end - let(:expected_issue) { cost_entry.work_package } + let(:expected_work_package) { cost_entry.work_package } let(:expected_user) { cost_entry.user } let(:expected_project) { cost_entry.project } let(:expected_cost_type) { cost_entry.cost_type } @@ -514,14 +514,14 @@ describe CostlogController do describe "WHEN the user is allowed to update cost_entries WHEN updating: - issue_id + work_package_id user_id units cost_type overridden_costs spent_on" do - let(:expected_issue) { FactoryGirl.create(:issue, :project => project, + let(:expected_work_package) { FactoryGirl.create(:work_package, :project => project, :tracker => project.trackers.first, :author => user) } let(:expected_user) { FactoryGirl.create(:user) } @@ -534,7 +534,7 @@ describe CostlogController do grant_current_user_permissions expected_user, [] grant_current_user_permissions user, [:edit_cost_entries] - params["cost_entry"]["work_package_id"] = expected_issue.id.to_s + params["cost_entry"]["work_package_id"] = expected_work_package.id.to_s params["cost_entry"]["user_id"] = expected_user.id.to_s params["cost_entry"]["spent_on"] = expected_spent_on.to_s params["cost_entry"]["units"] = expected_units.to_s @@ -585,33 +585,33 @@ describe CostlogController do end describe "WHEN the user is allowed to update cost_entries - WHEN updating the issue - WHEN the new issue isn't an issue of the current project" do + WHEN updating the work_package + WHEN the new work_package isn't an work_package of the current project" do let(:project2) { FactoryGirl.create(:project_with_trackers) } - let(:issue2) { FactoryGirl.create(:issue, :project => project2, + let(:work_package2) { FactoryGirl.create(:work_package, :project => project2, :tracker => project2.trackers.first) } - let(:expected_issue) { issue2 } + let(:expected_work_package) { work_package2 } before do grant_current_user_permissions user, [:edit_cost_entries] - params["cost_entry"]["work_package_id"] = issue2.id.to_s + params["cost_entry"]["work_package_id"] = work_package2.id.to_s end it_should_behave_like "invalid update" end describe "WHEN the user is allowed to update cost_entries - WHEN updating the issue - WHEN the new issue_id isn't existing" do + WHEN updating the work_package + WHEN the new work_package_id isn't existing" do - let(:expected_issue) { nil } + let(:expected_work_package) { nil } before do grant_current_user_permissions user, [:edit_cost_entries] - params["cost_entry"]["work_package_id"] = (issue.id + 1).to_s + params["cost_entry"]["work_package_id"] = (work_package.id + 1).to_s end it_should_behave_like "invalid update" diff --git a/spec/factories/cost_entry_factory.rb b/spec/factories/cost_entry_factory.rb index ca0308a4f9..bff002d1d5 100644 --- a/spec/factories/cost_entry_factory.rb +++ b/spec/factories/cost_entry_factory.rb @@ -2,7 +2,7 @@ FactoryGirl.define do factory :cost_entry do project user { FactoryGirl.create(:user, :member_in_project => project)} - work_package { FactoryGirl.create(:issue, :project => project) } + work_package { FactoryGirl.create(:work_package, :project => project) } cost_type spent_on Date.today units 1 diff --git a/spec/models/cost_entry_spec.rb b/spec/models/cost_entry_spec.rb index b0905b5456..18875679dc 100644 --- a/spec/models/cost_entry_spec.rb +++ b/spec/models/cost_entry_spec.rb @@ -5,10 +5,10 @@ describe CostEntry do let(:project) { FactoryGirl.create(:project_with_trackers) } let(:project2) { FactoryGirl.create(:project_with_trackers) } - let(:issue) { FactoryGirl.create(:issue, :project => project, + let(:work_package) { FactoryGirl.create(:work_package, :project => project, :tracker => project.trackers.first, :author => user) } - let(:issue2) { FactoryGirl.create(:issue, :project => project2, + let(:work_package2) { FactoryGirl.create(:work_package, :project => project2, :tracker => project2.trackers.first, :author => user) } let(:user) { FactoryGirl.create(:user) } @@ -18,7 +18,7 @@ describe CostEntry do member FactoryGirl.build(:cost_entry, :cost_type => cost_type, :project => project, - :work_package => issue, + :work_package => work_package, :spent_on => date, :units => units, :user => user, @@ -28,7 +28,7 @@ describe CostEntry do let(:cost_entry2) do FactoryGirl.build(:cost_entry, :cost_type => cost_type, :project => project, - :work_package => issue, + :work_package => work_package, :spent_on => date, :units => units, :user => user, @@ -237,7 +237,7 @@ describe CostEntry do describe "WHEN no project is provided" do before do cost_entry.project = nil - # unfortunately the project get's set to the issue's project if no project is provided + # unfortunately the project get's set to the work_package's project if no project is provided # TODO: check if that is necessary cost_entry.work_package = nil end @@ -245,14 +245,14 @@ describe CostEntry do it { cost_entry.should_not be_valid } end - describe "WHEN no issue is provided" do + describe "WHEN no work_package is provided" do before { cost_entry.work_package = nil } it { cost_entry.should_not be_valid } end - describe "WHEN the issue is not in the project" do - before { cost_entry.work_package = issue2 } + describe "WHEN the work_package is not in the project" do + before { cost_entry.work_package = work_package2 } it { cost_entry.should_not be_valid } end diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb index 2e49906b4e..af3ca38566 100644 --- a/spec/models/issue_spec.rb +++ b/spec/models/issue_spec.rb @@ -1,6 +1,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') -describe Issue do +describe WorkPackage do let(:user) { FactoryGirl.create(:admin)} let(:role) { FactoryGirl.create(:role) } let(:project) do @@ -10,10 +10,10 @@ describe Issue do end let(:project2) { FactoryGirl.create(:project_with_trackers) } - let(:issue) { FactoryGirl.create(:issue, :project => project, + let(:work_package) { FactoryGirl.create(:work_package, :project => project, :tracker => project.trackers.first, :author => user) } - let!(:cost_entry) { FactoryGirl.create(:cost_entry, work_package: issue, project: project, units: 3, spent_on: Date.today, user: user, comments: "test entry") } + let!(:cost_entry) { FactoryGirl.create(:cost_entry, work_package: work_package, project: project, units: 3, spent_on: Date.today, user: user, comments: "test entry") } let!(:cost_object) { FactoryGirl.create(:cost_object, project: project) } before(:each) do @@ -21,17 +21,17 @@ describe Issue do end it "should update cost entries on move" do - issue.project_id.should eql project.id - issue.move_to_project(project2).should_not be_false + work_package.project_id.should eql project.id + work_package.move_to_project(project2).should_not be_false cost_entry.reload.project_id.should eql project2.id end it "should allow to set cost_object to nil" do - issue.cost_object = cost_object - issue.save! - issue.cost_object.should eql cost_object + work_package.cost_object = cost_object + work_package.save! + work_package.cost_object.should eql cost_object - issue.cost_object = nil - lambda { issue.save! }.should_not raise_error(ActiveRecord::RecordInvalid) + work_package.cost_object = nil + lambda { work_package.save! }.should_not raise_error(ActiveRecord::RecordInvalid) end end diff --git a/spec/models/time_entry_spec.rb b/spec/models/time_entry_spec.rb index 3b3f142022..7ccadfec77 100644 --- a/spec/models/time_entry_spec.rb +++ b/spec/models/time_entry_spec.rb @@ -4,10 +4,10 @@ describe TimeEntry do include Cost::PluginSpecHelper let(:project) { FactoryGirl.create(:project_with_trackers, is_public: false) } let(:project2) { FactoryGirl.create(:project_with_trackers, is_public: false) } - let(:issue) { FactoryGirl.create(:issue, :project => project, + let(:work_package) { FactoryGirl.create(:work_package, :project => project, :tracker => project.trackers.first, :author => user) } - let(:issue2) { FactoryGirl.create(:issue, :project => project2, + let(:work_package2) { FactoryGirl.create(:work_package, :project => project2, :tracker => project2.trackers.first, :author => user2) } let(:user) { FactoryGirl.create(:user) } @@ -23,7 +23,7 @@ describe TimeEntry do let(:hours) { 5.0 } let(:time_entry) do FactoryGirl.create(:time_entry, :project => project, - :work_package => issue, + :work_package => work_package, :spent_on => date, :hours => hours, :user => user, @@ -33,7 +33,7 @@ describe TimeEntry do let(:time_entry2) do FactoryGirl.create(:time_entry, :project => project, - :work_package => issue, + :work_package => work_package, :spent_on => date, :hours => hours, :user => user, diff --git a/spec/models/user_deletion_spec.rb b/spec/models/user_deletion_spec.rb index 72603cf0f0..a5dac2600c 100644 --- a/spec/models/user_deletion_spec.rb +++ b/spec/models/user_deletion_spec.rb @@ -120,16 +120,16 @@ describe User, "#destroy" do end describe "WHEN the user has a cost entry" do - let(:issue) { FactoryGirl.create(:issue) } + let(:work_package) { FactoryGirl.create(:work_package) } let(:entry) { FactoryGirl.build(:cost_entry, :user => user, - :project => issue.project, + :project => work_package.project, :units => 100.0, :spent_on => Date.today, - :work_package => issue, + :work_package => work_package, :comments => "") } before do - FactoryGirl.create(:member, :project => issue.project, + FactoryGirl.create(:member, :project => work_package.project, :user => user, :roles => [FactoryGirl.build(:role)]) entry.save! diff --git a/spec/models/variable_cost_object_spec.rb b/spec/models/variable_cost_object_spec.rb index 7da74d23d7..f4564d93b9 100644 --- a/spec/models/variable_cost_object_spec.rb +++ b/spec/models/variable_cost_object_spec.rb @@ -31,18 +31,18 @@ describe VariableCostObject do end describe "destroy" do - let(:issue) { FactoryGirl.create(:issue) } + let(:work_package) { FactoryGirl.create(:work_package) } before do cost_object.author = user - cost_object.work_packages = [issue] + cost_object.work_packages = [work_package] cost_object.save! cost_object.destroy end it { VariableCostObject.find_by_id(cost_object.id).should be_nil } - it { Issue.find_by_id(issue.id).should == issue } - it { issue.reload.cost_object.should be_nil } + it { WorkPackage.find_by_id(work_package.id).should == work_package } + it { work_package.reload.cost_object.should be_nil } end end