Using layout refinery/flash to render the flash message in a partial …

…response.
resolve · Feb 23, 2012 · 50a3607 · 50a3607
1 parent c137275
commit 50a3607
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 34 deletions.
diff --git a/core/app/views/layouts/refinery/admin_dialog.html.erb b/core/app/views/layouts/refinery/admin_dialog.html.erb
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <%= render '/refinery/html_tag' %>
-  <% if @dialog_successful ||= params[:dialog_successful]%>
+  <% if @dialog_successful ||= params[:dialog_successful] %>
     <%= render '/refinery/admin/dialog_success' %>
   <% else %>
     <%= render '/refinery/admin/head' %>

diff --git a/core/app/views/layouts/refinery/flash.html.erb b/core/app/views/layouts/refinery/flash.html.erb
@@ -1 +1,2 @@
-<%= render '/refinery/message' if request.xhr? %>
+<%= render :partial => '/refinery/message' if request.xhr? %>
+<%= yield %>
diff --git a/core/app/views/refinery/admin/_dialog_success.html.erb b/core/app/views/refinery/admin/_dialog_success.html.erb
@@ -1,3 +1,5 @@
 <head>
   <script>parent.refinery_dialog_success();</script>
-</head>
+</head>
+<body>
+</body>
diff --git a/core/lib/refinery/crud.rb b/core/lib/refinery/crud.rb
@@ -187,7 +187,10 @@ def paginate_all_#{plural_name}
           # If the controller is being accessed via an ajax request
           # then render only the collection of items.
           def render_partial_response?
-            render :partial => '#{plural_name}' and return if request.xhr?
+            if request.xhr?
+              render :text => render_to_string(:partial => '#{plural_name}', :layout => false).html_safe,
+                     :layout => 'refinery/flash' and return false
+            end
           end
 
           # Returns a weighted set of results based on the query specified by the user.

diff --git a/images/app/controllers/refinery/admin/images_controller.rb b/images/app/controllers/refinery/admin/images_controller.rb
@@ -55,11 +55,11 @@ def create
         unless params[:insert]
           if @images.all?(&:valid?)
             flash.notice = t('created', :scope => 'refinery.crudify', :what => "'#{@images.map(&:title).join("', '")}'")
-            unless from_dialog?
-              redirect_to refinery.admin_images_path
-            else
+            if from_dialog?
               @dialog_successful = true
               render :nothing => true, :layout => true
+            else
+              redirect_to refinery.admin_images_path
             end
           else
             self.new # important for dialogs

diff --git a/images/app/views/refinery/admin/images/_records.html.erb b/images/app/views/refinery/admin/images/_records.html.erb
@@ -1,18 +1,18 @@
 <% if searching? %>
   <h2><%= t('results_for', :scope => 'refinery.admin.search', :query => params[:search]) %></h2>
 <% end %>
-<% if @images.any? %>
-  <div class='pagination_container'>
+<div class='pagination_container'>
+  <% if @images.any? %>
     <%= render 'images' %>
-  </div>
-<% else %>
-  <p>
-    <% unless searching? %>
-      <strong>
-        <%= t('.no_images_yet') %>
-      </strong>
-    <% else %>
-      <%= t('no_results', :scope => 'refinery.admin.search') %>
-    <% end %>
-  </p>
-<% end %>
+  <% else %>
+    <p>
+      <% unless searching? %>
+        <strong>
+          <%= t('.no_images_yet') %>
+        </strong>
+      <% else %>
+        <%= t('no_results', :scope => 'refinery.admin.search') %>
+      <% end %>
+    </p>
+  <% end %>
+</div>
diff --git a/resources/app/views/refinery/admin/resources/_records.html.erb b/resources/app/views/refinery/admin/resources/_records.html.erb
@@ -1,16 +1,16 @@
 <% if searching? %>
   <h2><%= t('results_for', :scope => 'refinery.admin.search', :query => params[:search]) %></h2>
 <% end %>
-<% if @resources.any? %>
-  <div class='pagination_container'>
+<div class='pagination_container'>
+  <% if @resources.any? %>
     <%= render 'resources' %>
-  </div>
-<% else %>
-  <p>
-    <% unless searching? %>
-      <strong><%= t('.no_files_yet') %></strong>
-    <% else %>
-      <%= t('no_results', :scope => 'refinery.admin.search') %>
-    <% end %>
-  </p>
-<% end %>
+  <% else %>
+    <p>
+      <% unless searching? %>
+        <strong><%= t('.no_files_yet') %></strong>
+      <% else %>
+        <%= t('no_results', :scope => 'refinery.admin.search') %>
+      <% end %>
+    </p>
+  <% end %>
+</div>
diff --git a/resources/app/views/refinery/admin/resources/_resources.html.erb b/resources/app/views/refinery/admin/resources/_resources.html.erb
@@ -1,4 +1,4 @@
-<%= will_paginate @resources %>
+<%= will_paginate @resources if Refinery::Admin::ResourcesController.pageable? %>
 <div class="<%= ['clearfix', 'pagination_frame', pagination_css_class].compact.join(' ') %>">
   <% group_by_date(@resources).each do |container|
        date = Date.parse((resource_group = container.last).first.created_at.to_s) %>