substituted render :partial => '' with render '' in as many places as…

… I could quickly.
resolve · Feb 19, 2012 · df8b2f4 · df8b2f4
1 parent 6619ef3
commit df8b2f4
Show file tree

Hide file tree

Showing 70 changed files with 115 additions and 125 deletions.
diff --git a/authentication/app/views/refinery/admin/users/_records.html.erb b/authentication/app/views/refinery/admin/users/_records.html.erb
@@ -1,3 +1,3 @@
 <div class='pagination_container'>
-  <%= render :partial => 'users' %>
+  <%= render 'users' %>
 </div>
diff --git a/authentication/app/views/refinery/admin/users/_users.html.erb b/authentication/app/views/refinery/admin/users/_users.html.erb
@@ -1,4 +1,4 @@
 <%= will_paginate @users %>
 <ul>
-  <%= render :partial => "user", :collection => @users %>
+  <%= render :partial => 'user', :collection => @users %>
 </ul>
diff --git a/authentication/app/views/refinery/admin/users/edit.html.erb b/authentication/app/views/refinery/admin/users/edit.html.erb
@@ -1 +1 @@
-<%= render :partial => 'form' %>
+<%= render 'form' %>
diff --git a/authentication/app/views/refinery/admin/users/index.html.erb b/authentication/app/views/refinery/admin/users/index.html.erb
@@ -1,6 +1,6 @@
 <section id='records'>
-  <%= render :partial => 'records' %>
+  <%= render 'records' %>
 </section>
 <aside id='actions'>
-  <%= render :partial => 'actions' %>
+  <%= render 'actions' %>
 </aside>
diff --git a/authentication/app/views/refinery/admin/users/new.html.erb b/authentication/app/views/refinery/admin/users/new.html.erb
@@ -1 +1 @@
-<%= render :partial => "form" %>
+<%= render 'form' %>
diff --git a/authentication/app/views/refinery/layouts/login.html.erb b/authentication/app/views/refinery/layouts/login.html.erb
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
-<%= render :partial => "/refinery/html_tag" %>
-  <%= render :partial => "/refinery/admin/head" %>
+<%= render '/refinery/html_tag' %>
+  <%= render '/refinery/admin/head' %>
   <body class='login <%= I18n.locale %>'>
     <div id='tooltip_container'></div>
     <header>
@@ -10,7 +10,7 @@
       <div id="page">
         <div id="content" class="clearfix">
           <div id="flash_container">
-            <%= render :partial => "/refinery/message" %>
+            <%= render '/refinery/message' %>
           </div>
           <%= yield %>
         </div>

diff --git a/core/app/assets/javascripts/wymeditor/browsers/mozilla.js.erb b/core/app/assets/javascripts/wymeditor/browsers/mozilla.js.erb
@@ -290,4 +290,4 @@ WYMeditor.WymClassMozilla.prototype.getTagForStyle = function(style) {
   if(/sub/.test(style)) return 'sub';
   if(/super/.test(style)) return 'super';
   return false;
-};
+};
diff --git a/core/app/assets/javascripts/wymeditor/browsers/opera.js.erb b/core/app/assets/javascripts/wymeditor/browsers/opera.js.erb
@@ -120,4 +120,4 @@ WYMeditor.WymClassOpera.prototype.keyup = function(e) {
   var wym = WYMeditor.INSTANCES[this.title];
   wym._selected_image = null;
   $(wym._iframe).contents().find('.selected_by_wym').removeClass('selected_by_wym');
-};
+};
diff --git a/core/app/assets/javascripts/wymeditor/browsers/webkit.js.erb b/core/app/assets/javascripts/wymeditor/browsers/webkit.js.erb
@@ -281,4 +281,4 @@ WYMeditor.WymClassSafari.prototype.getTagForStyle = function(style) {
   if(/sub/.test(style)) return 'sub';
   if(/super/.test(style)) return 'sup';
   return false;
-};
+};
diff --git a/core/app/assets/javascripts/wymeditor/classes.js.erb b/core/app/assets/javascripts/wymeditor/classes.js.erb
@@ -1574,4 +1574,4 @@ function titleize(words) {
     parts.push(part.substring(0,1).toUpperCase() + part.substring(1));
   });
   return parts.join(" ");
-}
+}
diff --git a/core/app/assets/javascripts/wymeditor/functions.js.erb b/core/app/assets/javascripts/wymeditor/functions.js.erb
@@ -215,4 +215,4 @@ WYMeditor.editor.prototype.close_dialog = function(e, cancelled) {
 // from http://simonwillison.net/2006/Jan/20/escape/#p-6
 RegExp.escape = function(text) {
   return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
-};
+};
diff --git a/core/app/assets/javascripts/wymeditor/validators.js.erb b/core/app/assets/javascripts/wymeditor/validators.js.erb
@@ -773,4 +773,4 @@ WYMeditor.XhtmlValidator = {
     }
     return this._possible_tag_attributes[tag];
   }
-};
+};
diff --git a/core/app/views/layouts/application.html.erb b/core/app/views/layouts/application.html.erb
@@ -1,21 +1,21 @@
 <!DOCTYPE html>
-<%= render :partial => '/refinery/html_tag' %>
-  <% site_bar = render(:partial => '/refinery/site_bar', :locals => {:head => true}) -%>
-  <%= render :partial => '/refinery/head' %>
+<%= render '/refinery/html_tag' %>
+  <% site_bar = render('/refinery/site_bar', :head => true) -%>
+  <%= render '/refinery/head' %>
   <body>
     <%= site_bar -%>
-    <%= render :partial => '/refinery/ie6check' if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>
+    <%= render '/refinery/ie6check' if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>
     <div id="page_container">
       <header id="header">
-        <%= render :partial => '/refinery/header' -%>
+        <%= render '/refinery/header' -%>
       </header>
       <section id="page">
         <%= yield %>
       </section>
       <footer>
-        <%= render :partial => '/refinery/footer' -%>
+        <%= render '/refinery/footer' -%>
       </footer>
     </div>
-    <%= render :partial => '/refinery/javascripts' %>
+    <%= render '/refinery/javascripts' %>
   </body>
 </html>
diff --git a/core/app/views/layouts/preview.html.erb b/core/app/views/layouts/preview.html.erb
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
-<%= render :partial => '/refinery/html_tag' %>
-  <%= render :partial => '/refinery/head' %>
+<%= render '/refinery/html_tag' %>
+  <%= render '/refinery/head' %>
   <body>
-    <%= render :partial => '/refinery/ie6check' if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>
+    <%= render '/refinery/ie6check' if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>
     <div id="page_container">
       <header id="header">
-        <%= render :partial => '/refinery/header' -%>
+        <%= render '/refinery/header' -%>
       </header>
       <section id="page">
         <%= yield %>
       </section>
       <footer>
-        <%= render :partial => '/refinery/footer' -%>
+        <%= render '/refinery/footer' -%>
       </footer>
     </div>
-    <%= render :partial => '/refinery/javascripts' %>
+    <%= render '/refinery/javascripts' %>
   </body>
 </html>
diff --git a/core/app/views/layouts/refinery/admin.html.erb b/core/app/views/layouts/refinery/admin.html.erb
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
-<%= render :partial => '/refinery/html_tag' %>
+<%= render '/refinery/html_tag' %>
   <% content_for :meta, "<meta refinerycms='#{Refinery.version}' />".html_safe %>
-  <%= render :partial => "refinery/admin/head" %>
+  <%= render 'refinery/admin/head' %>
   <body class="<%= action_name %> <%= I18n.locale %>">
-    <%= render :partial => '/refinery/site_bar' %>
+    <%= render '/refinery/site_bar' %>
     <div id='tooltip_container'></div>
     <header id="header">
-      <%= render :partial => "refinery/admin/menu" %>
+      <%= render 'refinery/admin/menu' %>
     </header>
     <div id="page_container">
       <div id="page">
         <div id="content" class="clearfix">
           <div id="flash_container">
-            <%= render :partial => '/refinery/no_script' %>
-            <%= render :partial => '/refinery/message' %>
+            <%= render '/refinery/no_script' %>
+            <%= render '/refinery/message' %>
           </div>
           <%= yield %>
         </div>

diff --git a/core/app/views/layouts/refinery/admin_dialog.html.erb b/core/app/views/layouts/refinery/admin_dialog.html.erb
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<%= render :partial => "/refinery/html_tag" %>
-  <%= render :partial => "/refinery/admin/head" %>
+<%= render '/refinery/html_tag' %>
+  <%= render '/refinery/admin/head' %>
   <body id='dialog_container' class='dialog <%= I18n.locale %><%= ' wym_iframe_body' if params[:wymeditor].presence %>'>
     <div id='tooltip_container'></div>
     <div id="flash_container">
-      <%= render :partial => '/refinery/message' %>
+      <%= render '/refinery/message' %>
     </div>
     <div id='content' class='clearfix'>
       <%= yield %>

diff --git a/core/app/views/refinery/_head.html.erb b/core/app/views/refinery/_head.html.erb
@@ -12,7 +12,7 @@
   <%= stylesheet_link_tag "home" if home_page? %>
   <%= yield :stylesheets %>
 
-  <%= render :partial => '/refinery/google_analytics' %>
+  <%= render '/refinery/google_analytics' %>
 
   <%= javascript_include_tag 'modernizr-min' %>
 </head>
diff --git a/core/app/views/refinery/admin/_form_actions.html.erb b/core/app/views/refinery/admin/_form_actions.html.erb
@@ -46,7 +46,7 @@
                    :class => "wymupdate button",
                    :tooltip => submit_button_title unless hide_submit %>
 
-    <%= render :partial => "/refinery/admin/continue_editing", :locals => {:f => f} if continue_editing -%>
+    <%= render '/refinery/admin/continue_editing', :f => f if continue_editing -%>
     <%= hidden_field_tag :continue_editing, false if continue_editing %>
 
     <%= local_assigns[:before_cancel_button] -%>

diff --git a/core/app/views/refinery/admin/_head.html.erb b/core/app/views/refinery/admin/_head.html.erb
@@ -9,5 +9,5 @@
     <%= stylesheet_link_tag css.path, css.options %>
   <% end %>
   <%= yield :stylesheets %>
-  <%= render :partial => "refinery/admin/javascripts" %>
+  <%= render 'refinery/admin/javascripts' %>
 </head>
diff --git a/core/app/views/refinery/admin/_tabbed_fields.html.erb b/core/app/views/refinery/admin/_tabbed_fields.html.erb
@@ -24,7 +24,7 @@
       <% end %>
       <% pages_tabs.each_with_index do |tab, tab_index| %>
         <div class='page_part' id='<%= "custom_tab_#{tab_index}" %>'>
-          <%= render :partial => tab.partial, :locals => {:f => f} %>
+          <%= render tab.partial, :f => f %>
         </div>
       <% end %>
     </div>

diff --git a/core/lib/generators/refinery/engine/templates/app/models/refinery/namespace/singular_name.rb b/core/lib/generators/refinery/engine/templates/app/models/refinery/namespace/singular_name.rb
@@ -2,8 +2,8 @@ module Refinery
   module <%= namespacing %>
     class <%= class_name %> < Refinery::Core::BaseModel
       <% if table_name == namespacing.underscore.pluralize -%>self.table_name = :refinery_<%= plural_name %><% end -%>
-    <% if (string_attributes = attributes.select{ |a| a.type.to_s =~ /string|text/ }.uniq.map(&:to_sym)).any? %>
-      acts_as_indexed :fields => <%= string_attributes.inspect %>
+    <% if (string_attributes = attributes.select{ |a| a.type.to_s =~ /string|text/ }.uniq).any? %>
+      acts_as_indexed :fields => <%= string_attributes.map{|s| s.name.to_sym}.inspect %>
 
       validates <%= string_attributes.first.inspect %>, :presence => true, :uniqueness => true
       <% else %>

diff --git a/...ery/engine/templates/app/views/refinery/namespace/admin/plural_name/_plural_name.html.erb b/...ery/engine/templates/app/views/refinery/namespace/admin/plural_name/_plural_name.html.erb
@@ -1,2 +1,2 @@
 <%%= will_paginate @<%= plural_name %> %>
-<%%= render :partial => "sortable_list" %>
+<%%= render 'sortable_list' %>
diff --git a/...efinery/engine/templates/app/views/refinery/namespace/admin/plural_name/_records.html.erb b/...efinery/engine/templates/app/views/refinery/namespace/admin/plural_name/_records.html.erb
@@ -3,7 +3,7 @@
 <%% end %>
 <%% if @<%= plural_name %>.any? %>
   <div class='pagination_container'>
-    <%%= render :partial => '<%= plural_name %>' %>
+    <%%= render '<%= plural_name %>' %>
   </div>
 <%% else %>
   <p>

diff --git a/...rs/refinery/engine/templates/app/views/refinery/namespace/admin/plural_name/edit.html.erb b/...rs/refinery/engine/templates/app/views/refinery/namespace/admin/plural_name/edit.html.erb
@@ -1 +1 @@
-<%%= render :partial => "form" %>
+<%%= render 'form' %>
diff --git a/...s/refinery/engine/templates/app/views/refinery/namespace/admin/plural_name/index.html.erb b/...s/refinery/engine/templates/app/views/refinery/namespace/admin/plural_name/index.html.erb
@@ -1,8 +1,8 @@
 <section id='records'>
-  <%%= render :partial => 'records' %>
+  <%%= render 'records' %>
 </section>
 <aside id='actions'>
-  <%%= render :partial => 'actions' %>
+  <%%= render 'actions' %>
 </aside>
 <%%= render :partial => '/refinery/admin/make_sortable',
             :locals => {

diff --git a/...ors/refinery/engine/templates/app/views/refinery/namespace/admin/plural_name/new.html.erb b/...ors/refinery/engine/templates/app/views/refinery/namespace/admin/plural_name/new.html.erb
@@ -1 +1 @@
-<%%= render :partial => "form" %>
+<%%= render 'form' %>
diff --git a/...erators/refinery/engine/templates/app/views/refinery/namespace/plural_name/index.html.erb b/...erators/refinery/engine/templates/app/views/refinery/namespace/plural_name/index.html.erb
@@ -8,4 +8,4 @@
   </ul>
 <%% end %>
 
-<%%= render :partial => "/refinery/content_page" %>
+<%%= render '/refinery/content_page' %>
diff --git a/...nerators/refinery/engine/templates/app/views/refinery/namespace/plural_name/show.html.erb b/...nerators/refinery/engine/templates/app/views/refinery/namespace/plural_name/show.html.erb
@@ -32,4 +32,4 @@
   </aside>
 <%% end %>
 
-<%%= render :partial => "/refinery/content_page" %>
+<%%= render '/refinery/content_page' %>
diff --git a/...s/refinery/form/templates/app/views/refinery/plural_name/admin/plural_name/index.html.erb b/...s/refinery/form/templates/app/views/refinery/plural_name/admin/plural_name/index.html.erb
@@ -1,4 +1,4 @@
-<%%= render :partial => "submenu" %>
+<%%= render 'submenu' %>
 <section id='records'>
-  <%%= render :partial => "records" %>
+  <%%= render 'records' %>
 </section>
diff --git a/...rs/refinery/form/templates/app/views/refinery/plural_name/admin/plural_name/spam.html.erb b/...rs/refinery/form/templates/app/views/refinery/plural_name/admin/plural_name/spam.html.erb
@@ -1,4 +1,4 @@
-<%%= render :partial => "submenu" %>
+<%%= render 'submenu' %>
 <div id='records'>
   <%% if searching? %>
     <h2><%%= t('shared.admin.search.results_for', :query => params[:search]) %></h2>

diff --git a/...ators/refinery/form/templates/app/views/refinery/plural_name/admin/settings/edit.html.erb b/...ators/refinery/form/templates/app/views/refinery/plural_name/admin/settings/edit.html.erb
@@ -1,5 +1,5 @@
 <%% if @refinery_setting.name.to_s.titleize =~ /R|recipients$/ %>
-  <%%= render :partial => "notification_recipients_form", :locals => {:edit => true} -%>
+  <%%= render 'notification_recipients_form', :edit => true -%>
 <%% else %>
-  <%%= render :partial => "confirmation_email_form", :locals => {:edit => true} -%>
+  <%%= render 'confirmation_email_form', :edit => true -%>
 <%% end %>
diff --git a/...enerators/refinery/form/templates/app/views/refinery/plural_name/plural_name/new.html.erb b/...enerators/refinery/form/templates/app/views/refinery/plural_name/plural_name/new.html.erb
@@ -35,4 +35,4 @@
     <%% end %>
   </div>
 <%% end %>
-<%%= render :partial => "/refinery/content_page" %>
+<%%= render '/refinery/content_page' %>
diff --git a/...ors/refinery/form/templates/app/views/refinery/plural_name/plural_name/thank_you.html.erb b/...ors/refinery/form/templates/app/views/refinery/plural_name/plural_name/thank_you.html.erb
@@ -1 +1 @@
-<%%= render :partial => "/shared/content_page" %>
+<%%= render '/shared/content_page' %>
diff --git a/core/lib/refinery/cli.rb b/core/lib/refinery/cli.rb
@@ -159,4 +159,4 @@ def uncrudify(controller, action)
       end
     end
   end
-end
+end
diff --git a/core/lib/refinery/crud.rb b/core/lib/refinery/crud.rb
@@ -87,7 +87,7 @@ def create
                   unless request.xhr?
                     redirect_to :back
                   else
-                    render :partial => "/refinery/message"
+                    render '/refinery/message'
                   end
                 end
               else
@@ -97,11 +97,9 @@ def create
               unless request.xhr?
                 render :action => 'new'
               else
-                render :partial => "/refinery/admin/error_messages",
-                       :locals => {
-                         :object => @#{singular_name},
-                         :include_object_name => true
-                       }
+                render '/refinery/admin/error_messages',
+                       :object => @#{singular_name},
+                       :include_object_name => true
               end
             end
           end
@@ -124,7 +122,7 @@ def update
                   unless request.xhr?
                     redirect_to :back
                   else
-                    render :partial => "/refinery/message"
+                    render '/refinery/message'
                   end
                 end
               else
@@ -134,11 +132,9 @@ def update
               unless request.xhr?
                 render :action => 'edit'
               else
-                render :partial => "/refinery/admin/error_messages",
-                       :locals => {
-                         :object => @#{singular_name},
-                         :include_object_name => true
-                       }
+                render '/refinery/admin/error_messages',
+                       :object => @#{singular_name},
+                       :include_object_name => true
               end
             end
           end
@@ -207,7 +203,7 @@ def index
                 search_all_#{plural_name} if searching?
                 paginate_all_#{plural_name}
 
-                render :partial => '#{plural_name}' if #{options[:xhr_paging].inspect} && request.xhr?
+                render '#{plural_name}' if #{options[:xhr_paging].inspect} && request.xhr?
               end
             )
           else
@@ -228,7 +224,7 @@ def index
               def index
                 paginate_all_#{plural_name}
 
-                render :partial => '#{plural_name}' if #{options[:xhr_paging].inspect} && request.xhr?
+                render '#{plural_name}' if #{options[:xhr_paging].inspect} && request.xhr?
               end
             )
           else
@@ -301,7 +297,6 @@ def self.searchable?
           end
         )
 
-
       end
 
     end

diff --git a/dashboard/app/views/refinery/admin/dashboard/_actions.html.erb b/dashboard/app/views/refinery/admin/dashboard/_actions.html.erb
@@ -29,7 +29,7 @@
                   :class => "add_icon" %>
     </li>
   <% end %>
-  <%= render :partial => 'additional_dashboard_menu_items' %>
+  <%= render 'additional_dashboard_menu_items' %>
 </ul>
 
 <% if ::Refinery.i18n_enabled? %>

diff --git a/dashboard/app/views/refinery/admin/dashboard/_records.html.erb b/dashboard/app/views/refinery/admin/dashboard/_records.html.erb
@@ -1,2 +1,2 @@
-<%= render :partial => "recent_activity" if @recent_activity.present? %>
-<%= render :partial => "recent_inquiries" if @recent_inquiries.present? %>
+<%= render :partial => 'recent_activity' if @recent_activity.present? %>
+<%= render :partial => 'recent_inquiries' if @recent_inquiries.present? %>