[myexperiment-hackers] [2789] branches/elico/app: Enabled layouts for packs and files

[noreply]

Revision

2789

Author

fbacall

Date

2011-11-09 04:52:06 -0500 (Wed, 09 Nov 2011)

Log Message

Enabled layouts for packs and files

Modified Paths

• branches/elico/app/controllers/blobs_controller.rb
• branches/elico/app/controllers/packs_controller.rb
• branches/elico/app/views/contributions/_sharing_form.rhtml

Diff

Modified: branches/elico/app/controllers/blobs_controller.rb (2788 => 2789)

--- branches/elico/app/controllers/blobs_controller.rb	2011-11-07 17:07:04 UTC (rev 2788)
+++ branches/elico/app/controllers/blobs_controller.rb	2011-11-09 09:52:06 UTC (rev 2789)
@@ -150,6 +150,7 @@
           @blob.contribution.update_attributes(params[:contribution])
         
           policy_err_msg = update_policy(@blob, params)
+          update_layout(@blob, params[:layout])
         
           update_credits(@blob, params)
           update_attributions(@blob, params)
@@ -195,6 +196,7 @@
         policy_err_msg = update_policy(@blob, params)
         update_credits(@blob, params)
         update_attributions(@blob, params)
+        update_layout(@blob, params[:layout])
         
         if policy_err_msg.blank?
           flash[:notice] = 'File was successfully updated.'

Modified: branches/elico/app/controllers/packs_controller.rb (2788 => 2789)

--- branches/elico/app/controllers/packs_controller.rb	2011-11-07 17:07:04 UTC (rev 2788)
+++ branches/elico/app/controllers/packs_controller.rb	2011-11-09 09:52:06 UTC (rev 2789)
@@ -127,6 +127,7 @@
         
         # update policy
         policy_err_msg = update_policy(@pack, params)
+        update_layout(@pack, params[:layout])
         
         if policy_err_msg.blank?
           flash[:notice] = 'Pack was successfully created.'
@@ -155,6 +156,7 @@
       if @pack.update_attributes(params[:pack])
         @pack.refresh_tags(convert_tags_to_gem_format(params[:pack][:tag_list]), current_user) if params[:pack][:tag_list]
         policy_err_msg = update_policy(@pack, params)
+        update_layout(@pack, params[:layout])
         
         if policy_err_msg.blank?
           flash[:notice] = 'Pack was successfully updated.'

Modified: branches/elico/app/views/contributions/_sharing_form.rhtml (2788 => 2789)

--- branches/elico/app/views/contributions/_sharing_form.rhtml	2011-11-07 17:07:04 UTC (rev 2788)
+++ branches/elico/app/views/contributions/_sharing_form.rhtml	2011-11-09 09:52:06 UTC (rev 2789)
@@ -163,8 +163,7 @@
         </p>
       <% end %>
       <br/>
-      <%# Only available for Workflows at the moment %>
-      <% if c_type == "Workflow" %>
+      <% if %w(Workflow Pack File).include?(c_type) %>
         <div id="layout_options_box">
           <strong>Layout:</strong>
           <div class="box_infotext" style="margin: 1em 0">