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

Fix model editing #1794

Merged
merged 6 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions app/controllers/models_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,12 @@ def edit
end

def update
@model.update(model_params)
redirect_to [@model.library, @model]
if @model.update(model_params)
redirect_to [@model.library, @model]
else
edit # Load creators and collections
render :edit
end
end

def merge
Expand Down
19 changes: 16 additions & 3 deletions app/helpers/application_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,15 @@ def tag_class(state)

def text_input_row(form, name)
content_tag :div, class: "row mb-3 input-group" do
[
safe_join [
form.label(name, class: "col-sm-2 col-form-label"),
form.text_field(name, class: "form-control col-auto")
].join.html_safe
content_tag(:div, class: "col p-0") do
safe_join [
form.text_field(name, class: "form-control"),
errors_for(form.object, name)
]
end
]
end
end

Expand All @@ -85,4 +90,12 @@ def nav_link(ico, text, path, options = {})
class: options[:style] || safe_join(["nav-link", (current_page?(path) ? "active" : "")], " ")
)
end

def errors_for(record, attribute)
return if record.nil? || attribute.nil?
return unless record.errors.include? attribute
content_tag(:div,
record.errors.full_messages_for(attribute).join("; "),
class: "invalid-feedback d-block")
end
end
8 changes: 8 additions & 0 deletions app/models/model.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ class Model < ApplicationRecord
before_validation :strip_separators_from_path, if: :path_changed?
before_validation :slugify_name, if: :name_changed?

before_validation :normalize_license
# In Rails 7.1 we will be able to do this instead:
# normalizes :license, with: -> license { license.blank? ? nil : license }

attr_reader :organize
def organize=(value)
@organize = ActiveRecord::Type::Boolean.new.cast(value)
Expand Down Expand Up @@ -105,6 +109,10 @@ def new?

private

def normalize_license
self.license = nil if license.blank?
end

def strip_separators_from_path
self.path = path&.trim_path_separators
end
Expand Down
5 changes: 4 additions & 1 deletion app/views/models/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@

<div class="row mb-3 input-group">
<%= form.label :license, class: "col-sm-2 col-form-label" %>
<%= form.select :license, license_select_options(selected: @model.license), {include_blank: true}, class: "form-control col-auto form-select" %>
<div class="col p-0">
<%= form.select :license, license_select_options(selected: @model.license), {include_blank: true}, class: "form-control form-select" %>
<%= errors_for @model, :license %>
</div>
</div>

<%= form.submit "Save", class: "btn btn-primary" %>
Expand Down
2 changes: 1 addition & 1 deletion config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ en:
general:
new: New Library
licenses:
CC-BY-40: Creative Commons Attrbution
CC-BY-40: Creative Commons Attribution
CC-BY-NC-40: Creative Commons Attribution NonCommercial
CC-BY-NC-ND-40: Creative Commons Attribution NonCommercial NoDerivatives
CC-BY-NC-SA-40: Creative Commons Attribution NonCommercial ShareAlike
Expand Down
2 changes: 1 addition & 1 deletion spec/helpers/application_helper_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
html = helper.text_input_row(form, :field)
doc = Nokogiri::HTML(html)
expect(doc.at("div.row")["class"]).to include("mb-3 input-group")
expect(doc.at("input")["class"]).to include("form-control col-auto")
expect(doc.at("input")["class"]).to include("form-control")
end
end

Expand Down
12 changes: 12 additions & 0 deletions spec/models/model_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,18 @@
m = build(:model, license: "LicenseRef-Commercial")
expect(m).to be_valid
end

it "can remove a license on save" do
m = create(:model, license: "MIT")
m.license = nil
expect(m).to be_valid
end

it "normalizes blank licenses to nil" do
m = build(:model, license: "")
m.validate
expect(m.license).to be_nil
end
end

it "strips leading and trailing separators from paths" do
Expand Down
Loading