Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport] Consider having valuator group as having valuator #3314

Merged
merged 1 commit into from
Feb 19, 2019

Conversation

javierm
Copy link
Member

@javierm javierm commented Feb 15, 2019

References

Objectives

Make the tab "without valuator" really mean "without valuator nor valuator group", just as expected by administrators.

Notes

As mentioned in the commit message:

There was a conflict while applying this commit to the CONSUL repo. I've decided to re-introduce the test which was deleted in commit dddf026, which hadn't been deleted in AyuntamientoMadrid/consul@192f1182.

spec/features/admin/budget_investments_spec.rb Outdated Show resolved Hide resolved
@@ -63,7 +63,8 @@ class Investment < ActiveRecord::Base

scope :valuation_open, -> { where(valuation_finished: false) }
scope :without_admin, -> { valuation_open.where(administrator_id: nil) }
scope :without_valuator, -> { valuation_open.where(valuator_assignments_count: 0) }
scope :without_valuator_group, -> { where(valuator_group_assignments_count: 0) }
scope :without_valuator, -> { valuation_open.without_valuator_group.where(valuator_assignments_count: 0) }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Metrics/LineLength: Line is too long. [121/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

So under the tab "without valuator" we don't show investments assigned
to a valuator group, just as expected by administrators.

There was a conflict while applying this commit to the CONSUL repo. I've
decided to re-introduce the test which was deleted in commit dddf026,
which hadn't been deleted in AyuntamientoMadrid/consul@192f1182.
@javierm javierm merged commit 7c61f62 into master Feb 19, 2019
@javierm javierm deleted the backport-without_valuator branch February 19, 2019 17:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants