Merge branch 'rails' of 0xacab.org:sutty/sutty into usar-sutty-editor

app/models/site.rb

@@ -166,8 +166,10 @@ class Site < ApplicationRecord
   end
 
   # Similar a site.i18n en jekyll-locales
+  #
+  # @return [Hash]
   def i18n
-    data[I18n.locale.to_s]
+    data[I18n.locale.to_s] || {}
   end
 
   # Devuelve el idioma por defecto del sitio, el primero de la lista.
@@ -470,7 +472,7 @@ class Site < ApplicationRecord
     config.theme = design.gem unless design.no_theme?
     config.description = description
     config.title = title
-    config.url = url
+    config.url = url(slash: false)
     config.hostname = hostname
   end
 

app/views/posts/attributes/_file.haml

@@ -1,7 +1,5 @@
 .form-group
   - if metadata.static_file
-    = hidden_field_tag "#{base}[#{attribute}][path]", metadata.value['path']
-
     - case metadata.static_file.blob.content_type
       - when %r{\Avideo/}
         = video_tag url_for(metadata.static_file),
@@ -14,13 +12,17 @@
       - else
         = link_to t('posts.attribute_ro.file.download'),
           url_for(metadata.static_file)
+    -# Mantener el valor si no enviamos ninguna imagen
+    = hidden_field_tag "#{base}[#{attribute}][path]", metadata.value['path']
+    -# Los archivos requeridos solo se pueden reemplazar
+    - unless metadata.required
       .custom-control.custom-switch
         = check_box_tag "#{base}[#{attribute}][path]", '', false, id: "#{base}_#{attribute}_destroy", class: 'custom-control-input'
         = label_tag "#{base}_#{attribute}_destroy", t('posts.attributes.file.destroy'), class: 'custom-control-label'
 
   .custom-file
     = file_field(*field_name_for(base, attribute, :path),
-      **field_options(attribute, metadata),
+      **field_options(attribute, metadata, required: (metadata.required && !metadata.path?)),
       class: "custom-file-input #{invalid(post, attribute)}",
       data: { preview: "#{attribute}-preview" })
     = label_tag "#{base}_#{attribute}_path",
@@ -30,7 +32,7 @@
 
 .form-group
   = label_tag "#{base}_#{attribute}_description",
-    post_label_t(attribute, :description, post: post)
+    post_label_t(attribute, :description, post: post, required: false)
   = text_field(*field_name_for(base, attribute, :description),
     value: metadata.value['description'],
     dir: dir, lang: locale,

app/views/posts/attributes/_image.haml

@@ -1,5 +1,5 @@
 .form-group
-  - if metadata.uploaded?
+  - if metadata.static_file
     = image_tag url_for(metadata.static_file),
       alt: metadata.value['description'],
       class: 'img-fluid',
@@ -37,4 +37,3 @@
     **field_options(attribute, metadata, required: false))
   = render 'posts/attribute_feedback',
     post: post, attribute: [attribute, :description], metadata: metadata
-