refinerycms 0.9.6.5 → 0.9.6.6

data/vendor/plugins/rails_indexes/test/fixtures/app/controllers/users_controller.rb

@@ -1,8 +1,8 @@
 class UsersController < ActionController::Base
-  
-  
+
+
   def index
     @freelancer = Freelancer.find_all_by_name(param[:name])
     @user = User.find(1)
   end
-end
+end

data/vendor/plugins/rails_indexes/test/fixtures/app/models/address.rb

@@ -1,5 +1,5 @@
 class Address < ActiveRecord::Base
-  
+
   belongs_to :addressable, :polymorphic => true
   belongs_to :country
-end
+end

data/vendor/plugins/rails_indexes/test/fixtures/app/models/company.rb

@@ -2,10 +2,10 @@ class Company < ActiveRecord::Base
 
   belongs_to :owner, :foreign_key => 'owner_id', :class_name => 'User'
   belongs_to :country
-  
+
   has_one :address, :as => :addressable
-  
+
   has_many :users
-  
+
   has_and_belongs_to_many :freelancers
-end
+end

data/vendor/plugins/rails_indexes/test/fixtures/app/models/country.rb

@@ -1,4 +1,4 @@
 class Country < ActiveRecord::Base
   has_many :addresses
   has_many :companies
-end
+end

data/vendor/plugins/rails_indexes/test/fixtures/app/models/freelancer.rb

@@ -1,3 +1,3 @@
 class Freelancer < ActiveRecord::Base
   has_and_belongs_to_many :companies
-end
+end

data/vendor/plugins/rails_indexes/test/fixtures/app/models/gift.rb

@@ -1,10 +1,10 @@
 class Gift < ActiveRecord::Base
-  
+
   set_primary_key :custom_primary_key
   has_and_belongs_to_many :users, :join_table => "purchases", :association_foreign_key => 'buyer_id', :foreign_key => 'present_id'
-  
+
   def search_all(name, price)
     Gift.find_all_by_name_and_price(name, price)
   end
-  
-end
+
+end

data/vendor/plugins/rails_indexes/test/fixtures/app/models/god.rb

@@ -1,3 +1,3 @@
 class God < ActiveRecord::Base
   self.abstract_class = true
-end
+end

data/vendor/plugins/rails_indexes/test/fixtures/app/models/user.rb

@@ -1,16 +1,17 @@
 class User < ActiveRecord::Base
-  
+
   has_one :company, :foreign_key => 'owner_id'
-  has_one :address, :as => :addressable 
+  has_one :address, :as => :addressable
 
   has_and_belongs_to_many :users, :join_table => "purchases", :association_foreign_key => 'present_id', :foreign_key => 'buyer_id'
-  
-  
+
+  validates_uniqueness_of :name
+
   def search_via_email(email = "user@domain.com")
     self.find_by_email(email)
   end
-  
+
   def search_via_email_and_name(email, name)
     self.find_by_email_and_name(email, name)
   end
-end
+end

data/vendor/plugins/rails_indexes/test/fixtures/app/sweepers/user_sweeper.rb

@@ -6,4 +6,4 @@ class UserSweeper < ActionController::Caching::Sweeper
   def after_create(product)
     logger.info "Sweeped!"
   end
-end
+end

data/vendor/plugins/rails_indexes/test/fixtures/schema.rb

@@ -3,44 +3,44 @@ ActiveRecord::Schema.define do
     t.column "name",  :text
     t.column "email", :text
   end
-  
+
   create_table "companies", :force => true do |t|
     t.column "name",  :text
     t.column "owned_id", :integer
     t.column "country_id", :integer
   end
-  
+
   add_index :companies, :country_id
-  
+
   create_table "addresses", :force => true do |t|
     t.column "addressable_type", :string
     t.column "addressable_id", :integer
     t.column "address", :text
     t.column "country_id", :integer
   end
-  
+
   create_table "freelancers", :force => true do |t|
     t.column "name", :string
     t.column "price_per_hour", :integer
   end
-  
+
   create_table "companies_freelancers", :force => true do |t|
     t.column "freelancer_id", :integer
     t.column "company_id", :integer
   end
-  
+
   create_table "gifts", :force => true do |t|
     t.column "custom_primary_key", :integer
     t.column "name", :string
     t.column "price", :integer
   end
-  
+
   create_table "purchases", :force => true do |t|
     t.column "present_id", :integer
     t.column "buyer_id", :integer
   end
-  
+
   create_table "countries", :force => true do |t|
     t.column "name", :string
   end
-end
+end

data/vendor/plugins/rails_indexes/test/rails_indexes_test.rb

@@ -1,51 +1,51 @@
 require 'test_helper'
 
 class RailsIndexesTest < ActiveSupport::TestCase
-  
+
   test "relationship indexes are found" do
     @relationship_indexes = Indexer.check_for_indexes
 
     assert @relationship_indexes.size > 0
-    
+
     assert @relationship_indexes.has_key?("companies")
     assert @relationship_indexes.has_key?("companies_freelancers")
     assert @relationship_indexes.has_key?("addresses")
     assert @relationship_indexes.has_key?("purchases")
   end
-  
+
   # should add 2 composite indexes or each pair
   test "has_and_belongs_to_many" do
     @relationship_indexes = Indexer.check_for_indexes(true)
-    
+
     assert @relationship_indexes["companies_freelancers"].include?(["company_id", "freelancer_id"])
     assert @relationship_indexes["companies_freelancers"].include?(["freelancer_id", "company_id"])
   end
-  
+
   test "has_and_belongs_to_many with custom columns" do
     @relationship_indexes = Indexer.check_for_indexes(true)
-    
+
     assert @relationship_indexes["purchases"].include?(["present_id", "buyer_id"])
     assert @relationship_indexes["purchases"].include?(["buyer_id", "present_id"])
   end
-  
+
   test "belongs_to" do
     @relationship_indexes = Indexer.check_for_indexes(true)
     assert @relationship_indexes["addresses"].include?("country_id")
   end
-  
+
   test "belongs_to with a custom foreign key" do
     @relationship_indexes = Indexer.check_for_indexes(true)
     assert @relationship_indexes["companies"].include?("owner_id")
   end
-  
+
   test "should not add an already existing index" do
     @relationship_indexes = Indexer.check_for_indexes(true)
     assert !(@relationship_indexes["companies"].include?("country_id"))
   end
-  
+
   test "default find_by indexes for primary keys" do
     @find_by_indexes = Indexer.ar_find_indexes(false)
-    
+
     # Default added the primary key for each table
     assert @find_by_indexes.has_key?("users")
     assert @find_by_indexes.has_key?("companies")
@@ -53,30 +53,30 @@ class RailsIndexesTest < ActiveSupport::TestCase
     assert @find_by_indexes.has_key?("freelancers")
     assert @find_by_indexes.has_key?("countries")
   end
-  
+
   test "default find_by indexes for custom primary keys" do
     @find_by_indexes = Indexer.ar_find_indexes(false)
 
     assert @find_by_indexes["gifts"].include?("custom_primary_key")
   end
-  
+
   test "find_by indexes for self.find_by_email_and_name" do
     @find_by_indexes = Indexer.ar_find_indexes(false)
-    
+
     assert @find_by_indexes["users"].include?(["name", "email"])
     assert @find_by_indexes["users"].include?(["email", "name"])
   end
-  
+
   test "find_by indexes for Gift.find_all_by_name_and_price" do
     @find_by_indexes = Indexer.ar_find_indexes(false)
-    
+
     assert @find_by_indexes["gifts"].include?(["name", "price"])
     assert @find_by_indexes["gifts"].include?(["price", "name"])
   end
-  
+
   test "find_by indexes from UsersController" do
     @find_by_indexes = Indexer.ar_find_indexes(false)
-    
+
     assert @find_by_indexes["freelancers"].include?("name")
 
   end

data/vendor/plugins/refinery/app/views/admin/_head.html.erb

@@ -15,4 +15,4 @@
   <%= javascript_include_tag 'admin', 'thickbox', 'wymeditor/jquery.refinery.wymeditor.js', 'refinery/boot_wym', 'refinery/admin', :cache => (use_caching ? "cache/admin" : false) %>
   <%= javascript_include_tag "http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js" if RefinerySetting.find_or_set(:show_firebug_lite, false) -%>
   <%= yield :head %>
-</head>
+</head>

data/vendor/plugins/refinery/app/views/layouts/application.html.erb

@@ -17,4 +17,4 @@
       </div>
     </div>
   </body>
-</html>
+</html>

data/vendor/plugins/refinery/app/views/shared/_content_page.html.erb

@@ -29,4 +29,4 @@
   <div class='page_not_live'>
     This page is NOT live for public viewing.
   </div>
-<% end -%>
+<% end -%>

data/vendor/plugins/refinery/app/views/shared/_head.html.erb

@@ -12,4 +12,4 @@
   <%= "<meta name=\"keywords\" content=\"#{@meta.meta_keywords}\" />" if @meta.meta_keywords.present? %>
   <%= "<meta name=\"description\" content=\"#{@meta.meta_description}\" />" if @meta.meta_description.present? -%>
   <%= yield :head %>
-</head>
+</head>

data/vendor/plugins/refinery/app/views/shared/_header.html.erb

@@ -1,4 +1,4 @@
 <div id='header_content'>
   <h1><%= link_to RefinerySetting[:site_name], root_url %></h1>
   <%= render :partial => "/shared/menu" %>
-</div>
+</div>

data/vendor/plugins/refinery/app/views/shared/_menu.html.erb

@@ -4,4 +4,4 @@
       :hide_children => RefinerySetting.find_or_set(:menu_hide_children, false)
     } -%>
   </ul>
-<% end %>
+<% end %>

data/vendor/plugins/refinery/app/views/shared/_menu_branch.html.erb

@@ -8,10 +8,10 @@
 <% if menu_branch.in_menu? %>
   <li<%= " class='#{css.join(' ')}'" if css.present? -%><%= " id='#{domid}'" if domid.present? -%>>
     <%= link_to menu_branch.title, menu_branch.url %>
-    <% 
-      unless hide_children or       
-        menu_branch.parent_id.present? or       
-        (children = menu_branch.children.collect{|c| c if c.in_menu? }.compact).empty? 
+    <%
+      unless hide_children or
+        menu_branch.parent_id.present? or
+        (children = menu_branch.children.collect{|c| c if c.in_menu? }.compact).empty?
     -%>
       <ul class='clearfix'>
         <%= render :partial => "/shared/menu_branch",
@@ -20,4 +20,4 @@
       </ul>
     <% end -%>
   </li>
-<% end -%>
+<% end -%>

data/vendor/plugins/refinery/app/views/shared/_submenu.html.erb

@@ -2,4 +2,4 @@
   <ul id='submenu'>
     <%= render :partial => "/shared/submenu_branch", :collection => children %>
   </ul>
-<% end -%>
+<% end -%>

data/vendor/plugins/refinery/app/views/shared/admin/_continue_editing.html.erb

@@ -1,4 +1,4 @@
 <% unless f.object.new_record? -%>
   <%= hidden_field_tag :continue_editing, false %>
   <%= f.submit 'Save &amp; Continue Editing', :id => "submit_continue_button", :class => "wymupdate" %>
-<% end -%>
+<% end -%>

data/vendor/plugins/refinery/app/views/shared/admin/_error_messages_for.html.erb

@@ -1,2 +1,2 @@
 <%= error_messages_for symbol %>
-<input type='hidden' id='fieldsWithErrors' value='<%= object.errors.collect { |attrib, msg| "#{object.class.name.underscore}_#{attrib}"}.join(",") %>' />
+<input type='hidden' id='fieldsWithErrors' value='<%= object.errors.collect { |attrib, msg| "#{object.class.name.underscore}_#{attrib}"}.join(",") %>' />

data/vendor/plugins/refinery/app/views/shared/admin/_form_actions.html.erb

@@ -10,4 +10,4 @@
           :title => (title ||= "Cancelling will lose all changes you've made to this #{f.object.class.name.underscore.gsub("_", " ")}"),
           :id => "#{cancel_button_id ||= "cancel_button"}", :class => "close_dialog" %>
   <% end -%>
-</div>
+</div>

data/vendor/plugins/refinery/app/views/shared/admin/_image_picker.html.erb

@@ -2,33 +2,47 @@
   description ||= "image"
   thumbnail ||= "medium"
   toggle_image_display ||= false
+  randomiser = rand(Time.now.yesterday.to_i * Time.now.to_i)
 -%>
-<%= link_to "Show", "", :id => "current_image_toggler" if toggle_image_display -%>
-<%= f.hidden_field field, :id => 'custom_title_field' -%>
+<%= link_to "Show", "", :id => "current_image_toggler_#{randomiser}" if toggle_image_display -%>
+<%= f.hidden_field field, :id => "current_image_id_#{randomiser}" -%>
 
-<div id='current_image_container'<%= " style='display: none'" if toggle_image_display %> style="margin-top: 10px;">
-  <a id='current_image_link' href="<%= insert_admin_images_url %>?thickbox=true&amp;modal=true&amp;titlebar=true&amp;field=custom_title_field&amp;thumbnail=&amp;KeepThis=true&amp;TB_iframe=true&amp;width=958&amp;height=510" style='border: 0px' title='Change <%= description.titleize %>' name='Change <%= description.titleize %>' class='thickbox'>
+<div id='current_image_container_<%= randomiser %>'<%= " style='display: none'" if toggle_image_display %> style="margin-top: 10px;">
+  <a id='current_image_link_<%= randomiser %>' href="<%= insert_admin_images_url %>?thickbox=true&amp;modal=true&amp;titlebar=true&amp;callback=image_picker_<%= randomiser %>_changed&amp;KeepThis=true&amp;TB_iframe=true&amp;width=958&amp;height=510" style='border: 0px' title='Change <%= description.titleize %>' name='Change <%= description.titleize %>' class='thickbox'>
     <% unless image.nil? -%>
       <%= image_fu image, nil, {:class => "brown_border", :id => "current_picked_image"} %>
     <% else -%>
-      <img id="current_picked_image" class="" src="" alt="" style='display: none' />
+      <img id="current_picked_image_<%= randomiser %>" class="" src="" alt="" style='display: none' />
     <% end -%>
-    <p id='no_picked_image_selected' <%= "style='display: none;'" unless image.nil? %>>
+    <p id='no_picked_image_selected_<%= randomiser %>' <%= "style='display: none;'" if image.present? %>>
       There is currently no <%= description %> selected, please click here to add one.
     </p>
   </a>
   <br/>
-  <%= link_to "Remove current #{description}", "#", :id => "remove_picked_image", :style => "#{"display:none;" if image.nil?}" %>
+  <%= link_to "Remove current #{description}", "#", :id => "remove_picked_image_#{randomiser}", :style => "#{"display:none;" if image.nil?}" %>
 </div>
 
 <% content_for :head do -%>
   <script type='text/javascript'>
-    $(document).ready(function(){
-      image_picker.init({
-        thumbnail: '<%= thumbnail %>'
-        , toggle_image_display: <%= toggle_image_display.to_s %>
-        , description: '<%= description %>'
-      });
+    // We're so un-object-oriented here. We need to rewrite the jQuery admin.js file to use OO.
+    var image_picker_<%= randomiser %>_options = {
+      thumbnail: '<%= thumbnail %>'
+      , toggle_image_display: <%= toggle_image_display.to_s %>
+      , description: '<%= description %>'
+      , field: '#current_image_id_<%= randomiser %>'
+      , image_display: '#current_picked_image_<%= randomiser %>'
+      , no_image_message: '#no_picked_image_selected_<%= randomiser %>'
+      , remove_image_button: '#remove_picked_image_<%= randomiser %>'
+      , image_container: '#current_image_container_<%= randomiser %>'
+    };
+
+    $(document).ready(function(e) {
+      image_picker.init(image_picker_<%= randomiser %>_options);
     });
+
+    image_picker_<%= randomiser %>_changed = function(args) {
+      image_picker.init(image_picker_<%= randomiser %>_options);
+      image_picker.changed(args);
+    }
   </script>
 <% end %>

data/vendor/plugins/refinery/app/views/shared/admin/_resource_picker.html.erb

@@ -54,4 +54,4 @@
       });
     });
   </script>
-<% end %>
+<% end %>

data/vendor/plugins/refinery/app/views/shared/admin/_search.html.erb

@@ -2,4 +2,4 @@
   Search
   <input id="search" name="search" size="35" type="search" value="<%= params[:search] %>" />
   <%= submit_tag 'Go', :name => "" %>
-</form>
+</form>

data/vendor/plugins/refinery/app/views/shared/admin/_sortable_list.html.erb

@@ -6,4 +6,4 @@
       init_tooltips();
     });
   </script>
-<% end %>
+<% end %>

data/vendor/plugins/refinery/lib/generators/refinery/templates/model.rb

@@ -6,4 +6,4 @@ class <%= class_name %> < ActiveRecord::Base
   validates_presence_of :<%= attributes.first.name %>
   validates_uniqueness_of :<%= attributes.first.name %>
 
-end
+end

data/vendor/plugins/refinery/lib/generators/refinery/templates/public_controller.rb

@@ -27,4 +27,4 @@ protected
     @page = Page.find_by_link_url("/<%= plural_name %>")
   end
 
-end
+end

data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_sortable_list.html.erb

@@ -1,2 +1,2 @@
 <%%= render :partial => '<%= singular_name %>', :collection => @<%= plural_name %> %>
-<%%= render :partial => "/shared/admin/sortable_list", :locals => {:continue_reordering => (defined?(continue_reordering) ? continue_reordering : true)} %>
+<%%= render :partial => "/shared/admin/sortable_list", :locals => {:continue_reordering => (defined?(continue_reordering) ? continue_reordering : true)} %>