sunrise-widgets 0.1.0 → 0.1.1

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 gemspec
 
-gem "rails", "3.0.9"
+gem "rails", "3.0.10"
 gem "capybara", ">= 0.4.0"
 gem "sqlite3"
 
@@ -23,6 +23,7 @@ gem 'simple_form'
 gem 'awesome_nested_set'
 gem 'fastercsv'
 gem 'ckeditor'
+gem "has_scope"
 
 gem 'galetahub-enum_field', '~> 0.1.4', :require => 'enum_field'
 gem 'galetahub-salty_slugs', '~> 1.0.0', :require => 'salty_slugs'

data/app/controllers/manage/widgets_controller.rb

@@ -1,13 +1,18 @@
 class Manage::WidgetsController < Manage::BaseController
   inherit_resources
   defaults :route_prefix => 'manage'
-  
-  before_filter :make_filter, :only=>[:index]
 
   load_and_authorize_resource :class => Widget
-  
   cache_sweeper :widget_sweeper, :only => [:create, :update, :destroy]
   
+  with_options :only => [:index] do |i|
+    i.has_scope :with_title, :as => :title
+    i.has_scope :with_position, :as => :position
+    i.has_scope :with_type, :as => :type
+    i.has_scope :with_structure, :as => :structure
+  end
+  order_by :title, :created_at, :sort_order
+  
   def create
     create!{ manage_widgets_path }
   end
@@ -23,11 +28,6 @@ class Manage::WidgetsController < Manage::BaseController
   protected
     
     def collection
-      @widgets = (@widgets || end_of_association_chain).merge(@search.scoped).includes(:structure).page(params[:page])
-    end
-    
-    def make_filter
-      @search = Sunrise::ModelFilter.new(Widget, :attributes => [:title, :widget_position_id, :widget_type_id])
-      @search.update_attributes(params[:search])
+      @widgets = (@widgets || end_of_association_chain).order(search_filter.order).includes(:structure).page(params[:page])
     end
 end

data/app/views/manage/widgets/_model_filter.html.erb

@@ -2,22 +2,31 @@
   <div class="filt-bl">
     <%= link_to_function t('manage.model_filter.title'), "Manage.toggle_element('block_filter')", :class=>"dark-arr" %>
     
+    <%= t('manage.model_filter.total_count') %>: <%= @widgets.total_count %>
+    
     <%= cookie_content_tag(:div, :id=>"block_filter", :class=>"filt") do %>
-      <%= form_for @search, :as => :search, :url=>manage_widgets_path, :html=>{:method=>:get, :id=>"form_filter"} do |f| %>
-        <%= f.label :title, t('widget.title', :scope => [:activerecord, :attributes]) %>
-        <%= f.text_field :title, :class=>"text" %>
     
-        <%= f.label :widget_position_id, t('widget.widget_position_id', :scope => [:activerecord, :attributes]) %>
-        <%= f.collection_select :widget_position_id, WidgetPosition.all, :id, :title, :include_blank => true %>
+      <%= form_for search_filter, :url => manage_widgets_path, :html =>{ :method => :get } do |f| %>
+        <% controller.scopes_configuration.each do |key, value| %>
+          <% next if [:with_position, :with_type, :with_structure].include?(key) %>
+          <%= f.label value[:as], t(value[:as], :scope => "activerecord.attributes.widget") %>
+          <%= f.text_field value[:as], :class => "text", :name => value[:as] %>
+        <% end %>
+        
+        <%= f.label :widget_position_id, t(:widget_position_id, :scope => "activerecord.attributes.widget") %>
+        <%= f.collection_select :position, WidgetPosition.all, :id, :title, {:include_blank => true}, {:name => "position"} %>
+        
+        <%= f.label :widget_type_id, t(:widget_type_id, :scope => "activerecord.attributes.widget") %>
+        <%= f.collection_select :type, WidgetType.all, :id, :title, {:include_blank => true}, {:name => "type"} %>
+        
+        <%= f.label :structure_id, t(:structure_id, :scope => "activerecord.attributes.widget") %>
+        <%= f.select :structure, nested_set_options(Structure) {|i| "#{'–' * i.depth} #{i.title}"}, {:include_blank => true}, {:name => "structure"} %>
         
-        <%= f.label :widget_type_id, t('widget.widget_type_id', :scope => [:activerecord, :attributes]) %>
-        <%= f.collection_select :widget_type_id, WidgetType.all, :id, :title, :include_blank => true %>
-                  
         <div class="buts">
-          <%= content_tag(:button, :value=>"search", :type=>"submit", :name=>"commit", :class=>"gr cupid-green") do %>
+          <%= content_tag(:button, :value => "search", :type => "submit", :name => "commit", :class => "gr cupid-green") do %>
             <%= t('manage.model_filter.search') %>
           <% end %>
-          
+                          
           <%= link_to t('manage.model_filter.clear'), manage_widgets_path, :class=>"erase" %>
         </div>
       <% end %>
@@ -25,16 +34,12 @@
   </div>
   <div class="sort">
   	<label><%= t('manage.sort') %></label>
-    <div class="select-input"><%= link_to_function t("widgets.#{@search.order_column}_#{@search.order_type}", :scope => [:manage, :sort_columns], :default => :"#{@search.order_column}_#{@search.order_type}"), "SelectList.toggle(event)", :class=>"corn", :id=>'sort_select' %></div>
+    <div class="select-input"><%= link_to_function t(search_filter.current_order, :scope => "manage.widgets.sort"), "SelectList.toggle(event)", :class=>"corn", :id=>'sort_select' %></div>
     <div id='sort_select_list' class="select-list" style='display:none;'>
-      <%= link_to_sort(t('widgets.created_at_desc', :scope => [:manage, :sort_columns], :default => :created_at_desc), :name => "created_at", :order_type => 'desc') %>
-      <%= link_to_sort(t('widgets.created_at_asc', :scope => [:manage, :sort_columns], :default => :created_at_asc), :name => "created_at", :order_type => 'asc') %>
-      
-      <%= link_to_sort(t('widgets.title_desc', :scope => [:manage, :sort_columns], :default => :title_desc), :name => "title", :order_type => 'desc') %>
-      <%= link_to_sort(t('widgets.title_asc', :scope => [:manage, :sort_columns], :default => :title_asc), :name => "title", :order_type => 'asc') %>
-      
-      <%= link_to_sort(t('widgets.sort_order_desc', :scope => [:manage, :sort_columns], :default => :sort_order_desc), :name => "sort_order", :order_type => 'desc') %>
-      <%= link_to_sort(t('widgets.sort_order_asc', :scope => [:manage, :sort_columns], :default => :sort_order_asc), :name => "sort_order", :order_type => 'asc') %>
+      <% controller.orders_configuration.each do |key, value| %>
+        <%= link_to_sort(t("#{key}_desc", :scope => "manage.widgets.sort"), :name => key, :order_type=>'desc') %>
+        <%= link_to_sort(t("#{key}_asc", :scope => "manage.widgets.sort"), :name => key, :order_type=>'asc') %>
+      <% end %>
     </div>
   </div>
 </div>

data/lib/sunrise/models/widget.rb

@@ -21,8 +21,10 @@ module Sunrise
 	          scope :sortable, order("#{quoted_table_name}.sort_order DESC")
 	          scope :recently, order("#{quoted_table_name}.created_at DESC")
 	          scope :visible, where(:is_visible => true)
-	          scope :with_type, lambda { |type| where(:widget_type_id => type.id) }
-	          scope :with_position, lambda { |position| where(:widget_position_id => position.id) }
+	          scope :with_type, lambda { |type| where(:widget_type_id => type.try(:id) || type) }
+	          scope :with_position, lambda { |position| where(:widget_position_id => position.try(:id) || position) }
+	          scope :with_title, lambda {|title| where(["#{quoted_table_name}.title LIKE ?", "%#{title}%"]) }
+	          scope :with_structure, lambda {|structure| where(["#{quoted_table_name}.structure_id = ?", structure]) }
           end
         end
       end

data/lib/sunrise/widgets/version.rb

@@ -1,5 +1,5 @@
 module Sunrise
   module Widgets
-    VERSION = "0.1.0".freeze
+    VERSION = "0.1.1".freeze
   end
 end

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: sunrise-widgets
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Igor Galeta
+- Pavel Galeta
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-08-18 00:00:00 +03:00
+date: 2011-09-15 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +27,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 23
         segments: 
         - 0
-        - 1
-        - 5
-        version: 0.1.5
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id001
 description: Widgets plugin for Sunrise CMS via aimbulance