Merge pull request #2966 from benwbrum/development

Development to fromthepage
benwbrum · Feb 2, 2022 · e61cd9f · e61cd9f
2 parents fb97fdc + b18e2c5
commit e61cd9f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app/controllers/collection_controller.rb b/app/controllers/collection_controller.rb
@@ -365,10 +365,11 @@ def update
       @collection.update(collection_params)
     end
 
-    if @collection.save!
+    if @collection.save
       flash[:notice] = t('.notice')
       redirect_to action: 'edit', collection_id: @collection.id
     else
+      edit # load the appropriate variables
       render action: 'edit'
     end
   end

diff --git a/app/views/transcription_field/_field_layout.html.slim b/app/views/transcription_field/_field_layout.html.slim
@@ -16,7 +16,7 @@
             -if field.input_type == "instruction"
               div id="fields[#{field.id}][#{field.label}]" class="field-instructions"
                 h5 =t('.instructions')
-                p =field.label
+                p ==field.label
             -else
               =label_tag field.label, field.label
               -content = cell.nil? ? nil : cell.content

diff --git a/app/views/transcription_field/_metadata_field_layout.html.slim b/app/views/transcription_field/_metadata_field_layout.html.slim
@@ -9,7 +9,7 @@
         -if field.input_type == "instruction"
           div id="fields[#{field.id}][#{field.label}]" class="field-instructions"
             h5 =t('.instructions')
-            p =field.label
+            p ==field.label
         -else
           =label_tag field.label, field.label
           -if (defined? owner_preview) && owner_preview