Skip to content

DCC Issue 679 - Fix for issue that Super Admins unable to create new #3091

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.

Sign up for GitHub

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

Merged
raycarrick-ed merged 9 commits into from
Feb 1, 2022
Merged

DCC Issue 679 - Fix for issue that Super Admins unable to create new #3091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d5144d9
DCC Issue 679 - Fix for issue that Super Admins unable to create new
Jan 13, 2022
aa56797
Merge branch 'development' into bug-dcc-679-super-admins-unable-to-ad…
briri Jan 31, 2022
b419b18
DCC Issue 679 - Fix for issue that Super Admins unable to create new
Jan 13, 2022
fc6fcaa
Merge branch 'bug-dcc-679-super-admins-unable-to-add-new-organisation…
raycarrick-ed Feb 1, 2022
7e0f2e2
debugging
raycarrick-ed Feb 1, 2022
ce35995
undo debug - now working
raycarrick-ed Feb 1, 2022
60a88be
debugging failure
raycarrick-ed Feb 1, 2022
1be3a60
once more to debug
raycarrick-ed Feb 1, 2022
e2c4914
Remove prg has to have abbrev test
raycarrick-ed Feb 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/controllers/super_admin/orgs_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,8 @@ def org_params
params.require(:org).permit(:name, :abbreviation, :logo, :managed,
:contact_email, :contact_name,
:remove_logo, :feedback_enabled, :feedback_msg,
:org_id, :org_name, :org_crosswalk)
:org_id, :org_name, :org_crosswalk,
:funder, :institution, :organisation)
end

def merge_params
Expand Down
2 changes: 0 additions & 2 deletions app/models/org.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ class Org < ApplicationRecord
validates :name, presence: { message: PRESENCE_MESSAGE },
uniqueness: { message: UNIQUENESS_MESSAGE }

validates :abbreviation, presence: { message: PRESENCE_MESSAGE }

validates :is_other, inclusion: { in: BOOLEAN_VALUES,
message: PRESENCE_MESSAGE }

Expand Down
2 changes: 1 addition & 1 deletion app/views/orgs/_profile_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<div class="row">
<div class="form-group col-xs-8">
<%= f.label :abbreviation, _('Organisation abbreviated name'), class: "control-label" %>
<%= f.text_field :abbreviation, id: "org_abbreviation", class: "form-control", "aria-required": true %>
<%= f.text_field :abbreviation, id: "org_abbreviation", class: "form-control" %>
</div>
</div>
<% end %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/shared/org_selectors/_external_only.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ presenter = OrgSelectionPresenter.new(orgs: [default_org],
placeholder = _("Begin typing to see a list of suggestions.")
%>

<%= form.label :org_name, label %>
<%= form.text_field :org_name, class: "form-control autocomplete",
<%= form.label :name, label %>
<%= form.text_field :name, class: "form-control autocomplete",
placeholder: placeholder,
value: presenter.name,
spellcheck: true,
Expand Down
2 changes: 0 additions & 2 deletions spec/models/org_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
.with_message('must be unique')
}

it { is_expected.to validate_presence_of(:abbreviation) }

it { is_expected.to allow_values(true, false).for(:is_other) }

it { is_expected.not_to allow_value(nil).for(:is_other) }
Expand Down