fix manno#71: allows editing of attachment title and public state

MetaMeute · Mar 22, 2014 · 2eace20 · 2eace20
1 parent 28f1f3e
commit 2eace20
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/app/views/cfp/events/_form.html.haml b/app/views/cfp/events/_form.html.haml
@@ -5,7 +5,7 @@
     = f.input :event_type, :collection => translated_options(Event::TYPES)
     = f.input :track, :collection => @conference.tracks
     = f.input :time_slots, :as => :select, :collection => timeslots, :hint => t("cfp.event_time_slots_hint")
-    = f.input :language, :as => :language, :only => @conference.language_codes, :include_blank => ""
+    = f.input :language, :as => :bootstrap_language, :only => @conference.language_codes, :include_blank => ""
     = f.input :logo
   = f.inputs :name => t("cfp.detailed_description") do
     = f.input :abstract, :input_html => {:rows => 4}, :hint => t("cfp.event_abstract_hint") 

diff --git a/app/views/shared/_event_attachment_fields.html.erb b/app/views/shared/_event_attachment_fields.html.erb
diff --git a/app/views/shared/_event_attachment_fields.html.haml b/app/views/shared/_event_attachment_fields.html.haml
@@ -0,0 +1,12 @@
+%div.nested-fields
+  = f.inputs do
+    - if f.object.new_record?
+      = f.input :title
+      = f.input :public, :as => :boolean, :hint => "Is this attachment visible to the public?"
+      = f.input :attachment
+    - else
+      = f.input :title
+      = f.input :public, :as => :boolean, :hint => "Is this attachment visible to the public?"
+      %div.input
+        = link_to f.object.attachment_file_name, f.object.attachment.url, style: 'float:left'
+    = remove_association_link :event_attachment, f