Merge branch 'release/3.0' into dev

pull/6827/head
Christian Ratz 11 years ago
commit 946f837034
  1. 3
      doc/CHANGELOG.md
  2. 8
      lib/open_project/costs/patches/query_patch.rb
  3. 2
      lib/open_project/costs/version.rb
  4. 2
      openproject-costs.gemspec

@ -20,8 +20,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# Changelog
## 3.0.8 (new versions scheme)
* `#8230` Missing Translation when deleting Cost Type
* `#8233` Changing the default rate with invalid values
* `#10232` Work package filter introduced by plugins not displayed
## 5.0.4

@ -54,7 +54,9 @@ module OpenProject::Costs::Patches::QueryPatch
add_available_column(CurrencyQueryColumn.new(:labor_costs))
add_available_column(CurrencyQueryColumn.new(:overall_costs))
alias_method_chain :available_filters, :costs
Queries::WorkPackages::Filter.add_filter_type_by_field('cost_object_id', 'list_optional')
alias_method_chain :available_work_package_filters, :costs
end
end
@ -74,8 +76,8 @@ module OpenProject::Costs::Patches::QueryPatch
module InstanceMethods
# Wrapper around the +available_filters+ to add a new Cost Object filter
def available_filters_with_costs
@available_filters = available_filters_without_costs
def available_work_package_filters_with_costs
@available_filters = available_work_package_filters_without_costs
if project && project.module_enabled?(:costs_module)
openproject_costs_filters = {

@ -19,6 +19,6 @@
module OpenProject
module Costs
VERSION = "5.0.4"
VERSION = "3.0.8"
end
end

@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.test_files = Dir["spec/**/*"]
s.add_dependency "rails", "~> 3.2.9"
s.add_dependency "openproject-plugins", "~> 1.0.6"
s.add_dependency "openproject-plugins", "~> 3.0.8"
s.add_development_dependency "factory_girl_rails", "~> 4.0"
end

Loading…
Cancel
Save