Bug DCC Issues 592, 645 - Fix for Org Admins seeing deleted Plans for… #3087
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… Org. Fixes issues: https://github.com/DigitalCurationCentre/DMPonline-Service/issues/592 https://github.com/DigitalCurationCentre/DMPonline-Service/issues/645 https://github.com/DigitalCurationCentre/DMPonline-Service/issues/641 The reason we are seeing deleted (de-activated) Plans is that there is no filter for plans with Roles active in the Org model's org_admin_plans() method. Change added .where(roles: { active: true }) to filter plans in org_admin_plans() method of Org model.
johnpinto1
force-pushed
the
bug_dcc_592_and_645_deleted-private_plans_visible_to_org_admins
branch
from
18c650b
to
1173d60
Compare
Orgs. Fix for DCC issue https://github.com/DigitalCurationCentre/DMPonline-Service/issues/679 Changes: - in app/controllers/super_admin/orgs_controller.rb added missing params to orgs_params method :funder, :institution, :organisation - in app/models/org.rb removed (as it is never set on Org creation) validates :abbreviation, presence: { message: PRESENCE_MESSAGE } - in app/views/orgs/_profile_form.html.erb removed :abbreviation required "aria-required": true - in app/views/shared/org_selectors/_external_only.html.erb renamed wrongly named text field :org_name to :name <%= form.label :name, label %> <%= form.text_field :name, class: "form-control autocomplete",
…lans_visible_to_org_admins
…d-new-organisations
Orgs. Fix for DCC issue https://github.com/DigitalCurationCentre/DMPonline-Service/issues/679 Changes: - in app/controllers/super_admin/orgs_controller.rb added missing params to orgs_params method :funder, :institution, :organisation - in app/models/org.rb removed (as it is never set on Org creation) validates :abbreviation, presence: { message: PRESENCE_MESSAGE } - in app/views/orgs/_profile_form.html.erb removed :abbreviation required "aria-required": true - in app/views/shared/org_selectors/_external_only.html.erb renamed wrongly named text field :org_name to :name <%= form.label :name, label %> <%= form.text_field :name, class: "form-control autocomplete",
…s' of github.com:DMPRoadmap/roadmap into bug-dcc-679-super-admins-unable-to-add-new-organisations
Schrodinger's cat, it seems
in org model spec
org spec failing with no abbrev for some reason.
Used to be that org had to have an abbrev. That stopped the Super Admin creating the org so was removed. Remove check from this test.
…ble-to-add-new-organisations DCC Issue 679 - Fix for issue that Super Admins unable to create new
… Org. Fixes issues: https://github.com/DigitalCurationCentre/DMPonline-Service/issues/592 https://github.com/DigitalCurationCentre/DMPonline-Service/issues/645 https://github.com/DigitalCurationCentre/DMPonline-Service/issues/641 The reason we are seeing deleted (de-activated) Plans is that there is no filter for plans with Roles active in the Org model's org_admin_plans() method. Change added .where(roles: { active: true }) to filter plans in org_admin_plans() method of Org model.
…g_admins' of github.com:DMPRoadmap/roadmap into bug_dcc_592_and_645_deleted-private_plans_visible_to_org_admins
raycarrick-ed
deleted the
bug_dcc_592_and_645_deleted-private_plans_visible_to_org_admins
branch
raycarrick-ed
restored the
bug_dcc_592_and_645_deleted-private_plans_visible_to_org_admins
branch
raycarrick-ed
deleted the
bug_dcc_592_and_645_deleted-private_plans_visible_to_org_admins
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
… Org.
Fixes issues:
https://github.com/DigitalCurationCentre/DMPonline-Service/issues/592
https://github.com/DigitalCurationCentre/DMPonline-Service/issues/645
https://github.com/DigitalCurationCentre/DMPonline-Service/issues/641
The reason we are seeing deleted (de-activated) Plans is that there is
no filter for plans with Roles active in the Org model's
org_admin_plans() method.
Change added .where(roles: { active: true }) to filter plans in
org_admin_plans() method of Org model.