Merge branch 'release/0.6.15.10'

* release/0.6.15.10: #FIX fix
ulmic · Apr 25, 2016 · be95f4b · be95f4b
2 parents 9912d58 + ea932c9
commit be95f4b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/app/views/web/admin/news/_form.html.haml b/app/views/web/admin/news/_form.html.haml
@@ -21,7 +21,10 @@
       = f.input :title, as: :string
       = f.input :lead, as: :string
       = f.input :body, as: :ckeditor
-      = f.input :user_id, as: :select, collection: members_hash(@members), input_html: { class: :select2 }, selected: current_user.id
+      - if @news_form.user_id.present?
+        = f.input :user_id, as: :select, collection: members_hash(@members), input_html: { class: :select2 }
+      - else
+        = f.input :user_id, as: :select, collection: members_hash(@members), input_html: { class: :select2 }, selected: current_user.id
       = f.input :published_at, as: :datetime_picker
       = f.label :photo
       .preview