sunrise-feedbacks 0.1.1 → 0.2.0

data/app/controllers/manage/feedbacks_controller.rb

@@ -1,11 +1,13 @@
 class Manage::FeedbacksController < Manage::BaseController
   inherit_resources
   defaults :route_prefix => 'manage', :resource_class => FeedbackMessage
-  
-  before_filter :make_filter, :only=>[:index]
 
   load_and_authorize_resource :class => FeedbackMessage
   
+  has_scope :with_email, :as => :user_email, :only => :index
+  has_scope :with_phone, :as => :phone_number, :only => :index
+  order_by :created_at, :updated_at
+  
   def show
     @feedbacks = @feedback.siblings
     @feedback_answer = FeedbackAnswer.new
@@ -27,11 +29,6 @@ class Manage::FeedbacksController < Manage::BaseController
   protected
     
     def collection
-      @feedbacks = (@feedbacks || end_of_association_chain).merge(@search.scoped).page(params[:page])
-    end
-    
-    def make_filter
-      @search = Sunrise::ModelFilter.new(FeedbackMessage, :attributes => [:user_email, :phone_number])
-      @search.update_attributes(params[:search])
+      @feedbacks = (@feedbacks || end_of_association_chain).order(search_filter.order).page(params[:page])
     end
 end

data/app/views/manage/feedback_answers/_answer.html.erb

@@ -2,7 +2,7 @@
   <div class="r-corn">
     <div class="buttons" style="padding-top:0px;">
       <div class="act-bl">
-        <%= link_to image_tag("manage/ico_del.gif", :title=>t('manage.delete')), 
+        <%= link_to manage_icon("delete"), 
           manage_feedback_answer_path(:id=>answer.id), 
           :method=>:delete, 
           :confirm=>t("manage.confirm_delete"), 

data/app/views/manage/feedbacks/_feedback.html.erb

@@ -1,9 +1,13 @@
 <%= content_tag(:div, :id=>dom_id(feedback), :class=>"dinamic-bl") do %>
   <div class="act-bl" style="display:none;">
-    <%= link_to image_tag("manage/ico_edit.gif", :alt=>t('manage.edit'), :title=>t('manage.edit')), edit_manage_feedback_path(:id=>feedback.id), :class=>"icons" %>
-
-    <%= link_to image_tag("manage/ico_del.gif", :alt=>t('manage.delete'), :title=>t('manage.delete')), manage_feedback_path(:id=>feedback.id), 
+    <% if can? :update, feedback, :context => :manage %>
+      <%= link_to manage_icon("edit"), edit_manage_feedback_path(:id=>feedback.id), :class=>"icons" %>
+    <% end -%>
+    
+    <% if can? :delete, feedback, :context => :manage %>
+      <%= link_to manage_icon("delete"), manage_feedback_path(:id=>feedback.id), 
           :method=>:delete, :confirm=>t("manage.confirm_delete"), :class=>"icons" %>
+    <% end -%>
   </div>
   
   <div class="bot-bg">

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

@@ -2,15 +2,15 @@
   <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') %>: <%= @feedbacks.total_count %>
+    
     <%= cookie_content_tag(:div, :id=>"block_filter", :class=>"filt") do %>
-      <%= form_for @search, :as => :search, :url=>manage_feedbacks_path, :html=>{:method=>:get, :id=>"form_filter"} do |f| %>
-                  
-        <%= f.label :phone_number, t('feedback_message.phone_number', :scope => [:activerecord, :attributes]) %>
-        <%= f.text_field :phone_number, :class=>"text" %>
-                  
-        <%= f.label :user_email, t('feedback_message.user_email', :scope => [:activerecord, :attributes]) %>
-        <%= f.text_field :user_email, :class=>"text" %>
-                  
+      <%= form_for search_filter, :url => manage_feedbacks_path, :html => { :method => :get } do |f| %>
+        <% controller.scopes_configuration.each do |key, value| %>
+          <%= f.label value[:as], t(value[:as], :scope => "activerecord.attributes.feedback_message") %>
+          <%= f.text_field value[:as], :class => "text", :name => value[:as] %>
+        <% end %>
+          
         <div class="buts">
           <%= content_tag(:button, :value=>"search", :type=>"submit", :name=>"commit", :class=>"gr cupid-green") do %>
             <%= t('manage.model_filter.search') %>
@@ -23,14 +23,12 @@
   </div>
   <div class="sort">
   	<label><%= t('manage.sort') %></label>
-    <div class="select-input"><%= link_to_function t("feedbacks.#{@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.feedbacks.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('feedback_message.created_at_desc', :scope => [:manage, :sort_columns], :default => :created_at_desc), :name => "created_at", :order_type => 'desc') %>
-      <%= link_to_sort(t('feedback.created_at_asc', :scope => [:manage, :sort_columns], :default => :created_at_asc), :name => "created_at", :order_type => 'asc') %>
-      
-      <%= link_to_sort(t('feedback_message.updated_at_desc', :scope => [:manage, :sort_columns], :default => :updated_at_desc), :name => "updated_at", :order_type => 'desc') %>
-      <%= link_to_sort(t('feedbacks.updated_at_asc', :scope => [:manage, :sort_columns], :default => :updated_at_asc), :name => "updated_at", :order_type => 'asc') %>
+      <% controller.orders_configuration.each do |key, value| %>
+        <%= link_to_sort(t("#{key}_desc", :scope => "manage.feedbacks.sort"), :name => key, :order_type=>'desc') %>
+        <%= link_to_sort(t("#{key}_asc", :scope => "manage.feedbacks.sort"), :name => key, :order_type=>'asc') %>
+      <% end %>
     </div>
   </div>
 </div>

data/app/views/manage/feedbacks/show.html.erb

@@ -4,9 +4,14 @@
   </div>
 
   <div class="act-bl">
-    <%= link_to image_tag("manage/ico_edit.gif", :title=>t('manage.edit')), edit_manage_feedback_path(:id=>@feedback.id), :class=>"icons" %>
-
-    <%= link_to image_tag("manage/ico_del.gif", :title=>t('manage.delete')), manage_feedback_path(:id=>@feedback.id), :method=>:delete, :confirm=>t("manage.confirm_delete"), :class=>"icons" %>
+    <% if can? :update, @feedback, :context => :manage %>
+      <%= link_to manage_icon("edit"), edit_manage_feedback_path(:id=>@feedback.id), :class=>"icons" %>
+    <% end -%>
+    
+    <% if can? :delete, @feedback, :context => :manage %>
+      <%= link_to manage_icon("delete"), manage_feedback_path(:id=>@feedback.id), 
+          :method=>:delete, :confirm=>t("manage.confirm_delete"), :class=>"icons" %>
+    <% end -%>
   </div>
 </div>
 

data/lib/sunrise/feedbacks/version.rb

@@ -1,5 +1,5 @@
 module Sunrise
   module Feedbacks
-    VERSION = "0.1.1".freeze
+    VERSION = "0.2.0".freeze
   end
 end

data/lib/sunrise/models/feedback_message.rb

@@ -17,7 +17,9 @@ module Sunrise
             
             default_scope order("#{quoted_table_name}.id DESC")
             scope :recently, order("#{quoted_table_name}.created_at DESC")
-            scope :with_author, lambda { |item| where(["author_type = ? AND author_id = ?", item.author_type, item.author_id]) }
+            scope :with_author, lambda { |item| where(:author_type => item.author_type, :author_id => item.author_id) }
+            scope :with_email, lambda { |email| where(:user_email => email) }
+            scope :with_phone, lambda { |phone| where(:phone_number => phone) }
           end
         end
         

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sunrise-feedbacks
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Igor Galeta
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-01 00:00:00 +02:00
-default_executable: 
+date: 2012-04-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sunrise-cms
@@ -78,7 +77,6 @@ files:
 - lib/sunrise-feedbacks.rb
 - Rakefile
 - README.rdoc
-has_rdoc: true
 homepage: https://github.com/galetahub/sunrise-feedbacks
 licenses: []
 
@@ -108,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sunrise-feedbacks
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Rails CMS votes