Fix some renamings and replace .rdoc files with .md files.

pull/6827/head
Christian Rijke 11 years ago
parent 6b4c3eaaef
commit 22e7b3cbdf
  1. 2
      CHANGELOG.md
  2. 0
      README.md
  3. 2
      app/helpers/reporting_helper.rb
  4. 2
      app/models/cost_query/filter/priority_id.rb
  5. 2
      config/locales/en.yml
  6. 5
      features/links.feature
  7. 3
      openproject-reporting.gemspec

@ -1,3 +1,5 @@
* `#2061` Migrate to new data model.
= 4.0.0.pre3 - 2013-06-27 = 4.0.0.pre3 - 2013-06-27
Adapt to OpenProject core Adapt to OpenProject core

@ -82,7 +82,7 @@ module ReportingHelper
when :spent_on then format_date(value.to_date) when :spent_on then format_date(value.to_date)
when :type_id then Type.find(value.to_i).name when :type_id then Type.find(value.to_i).name
when :week then "#{l(:label_week)} #%s" % value.to_i.modulo(100) when :week then "#{l(:label_week)} #%s" % value.to_i.modulo(100)
when :priority_id then WorkPackagePriority.find(value.to_i).name when :priority_id then IssuePriority.find(value.to_i).name
when :fixed_version_id then Version.find(value.to_i).name when :fixed_version_id then Version.find(value.to_i).name
when :singleton_value then "" when :singleton_value then ""
when :status_id then IssueStatus.find(value.to_i).name when :status_id then IssueStatus.find(value.to_i).name

@ -7,6 +7,6 @@ class CostQuery::Filter::PriorityId < Report::Filter::Base
end end
def self.available_values(*) def self.available_values(*)
WorkPackagePriority.find(:all, :order => 'position DESC').map { |i| [i.name, i.id] } IssuePriority.find(:all, :order => 'position DESC').map { |i| [i.name, i.id] }
end end
end end

@ -24,7 +24,7 @@ en:
label_greater: ">" label_greater: ">"
label_is_not_project_with_subprojects: "is not (includes subprojects)" label_is_not_project_with_subprojects: "is not (includes subprojects)"
label_is_project_with_subprojects: "is (includes subprojects)" label_is_project_with_subprojects: "is (includes subprojects)"
label_work_package_attributes: "WorkPackage Attributes" label_work_package_attributes: "Work Package Attributes"
label_less: "<" label_less: "<"
label_money: "Cash value" label_money: "Cash value"
label_month_reporting: "Month (Spent)" label_month_reporting: "Month (Spent)"

@ -65,7 +65,8 @@ Feature: Cost Reporting Linkage
Then I should see "Successful deletion." Then I should see "Successful deletion."
And I should see "No data to display" And I should see "No data to display"
#have to use annotation capybara due to https://github.com/aslakhellesoy/cucumber-rails/work_packages/work_package/77 #have to use annotation capybara due to
#https://github.com/aslakhellesoy/cucumber-rails/issues/issues/77
@javascript @javascript
Scenario: Going from an WorkPackage to the cost report should set the filter on this work_package Scenario: Going from an WorkPackage to the cost report should set the filter on this work_package
Given there is a standard cost control project named "Standard Project" Given there is a standard cost control project named "Standard Project"
@ -94,7 +95,7 @@ Feature: Cost Reporting Linkage
And I should not see "50.00" And I should not see "50.00"
And I should not see "150.00" And I should not see "150.00"
#have to use annotation capybara due to https://github.com/aslakhellesoy/cucumber-rails/work_packages/work_package/77 #have to use annotation capybara due to https://github.com/aslakhellesoy/cucumber-rails/issues/issues/77
@javascript @javascript
Scenario: Going from an WorkPackage to the cost report should set the filter on this work_package Scenario: Going from an WorkPackage to the cost report should set the filter on this work_package
Given there is a standard cost control project named "Standard Project" Given there is a standard cost control project named "Standard Project"

@ -13,8 +13,7 @@ Gem::Specification.new do |s|
s.summary = "OpenProject plugin that creates table reports with custom fields and grouping" s.summary = "OpenProject plugin that creates table reports with custom fields and grouping"
# FIXME # FIXME
#s.description = "This plugin adds features enabling agile teams to work with OpenProject in Scrum projects." #s.description = "This plugin adds features enabling agile teams to work with OpenProject in Scrum projects."
# FIXME s.files = Dir["{app,config,db,lib}/**/*", "CHANGELOG.md", "README.md"]
# s.files = Dir["{app,config,db,lib}/**/*", "Rakefile", "README.rdoc"]
# FIXME # FIXME
# s.test_files = Dir["spec/**/*"] # s.test_files = Dir["spec/**/*"]

Loading…
Cancel
Save