qm-acts-as-generic-controller 0.0.10 → 0.0.11

data/Rakefile

@@ -9,11 +9,12 @@ begin
     gemspec.email = "marcin@saepia.net"
     gemspec.homepage = "http://q.saepia.net"
     gemspec.authors = ["Marcin Lewandowski"]
-    gemspec.version = "0.0.10"
+    gemspec.version = "0.0.11"
     gemspec.files = Rake::FileList.new [ "MIT-LICENSE", "Rakefile", "lib/*", "app/views/generic_controller/*" ]
     gemspec.add_dependency "qui-common-helpers", ">= 0.0.6"
     gemspec.add_dependency "rfc822"
     gemspec.add_dependency "sort_alphabetical"
+    gemspec.add_dependency "calendar_date_select"
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install jeweler"

data/app/views/generic_controller/_index_table.erb

@@ -6,6 +6,9 @@
 <%- has_edit = ActionController::Routing::Routes.routes.collect{|x| x if x.matches_controller_and_action?(controller_name, "edit") }.compact.size > 0 %>
 <%- has_delete = ActionController::Routing::Routes.routes.collect{|x| x if x.matches_controller_and_action?(controller_name, "destroy") }.compact.size > 0 %>
 
+<%- if defined?(QM::ActsAsWorkflow) and class_name.is_workflow? -%>
+  <%- headers << :"#{section}.workflow.common.indexTableHeader" -%>
+<%- end -%>
 
 <%- if defined?(QUI::IndexTable) -%>
 
@@ -17,6 +20,14 @@
       <td><%= render :partial => "generic_controller/data", :locals => { :record => r, :field => field } %></td>
     <%- end -%>
 
+    <%- if defined?(QM::ActsAsWorkflow) and class_name.is_workflow? -%>
+      <td>
+      <%- unless r.current_workflow_node.nil? -%>
+        <%= strip_tags t(:"#{section}.workflow.#{class_name.to_s.tableize.singularize}.#{r.current_workflow_node}.header", :object => link_to_object(r)).gsub("<br />", " ") %><br /><%= link_to_object(r.current_workflow_actor) %> (<%= relative_time(r.current_workflow_pending_time) %>) 
+      <%- end -%>
+      </td>
+    <%- end -%>
+
     <%- if has_edit -%>
       <td><%= link_to_edit r %></td>
     <%- end -%>

data/app/views/generic_controller/form.erb

@@ -14,7 +14,6 @@
   <%- end -%>
     
   <ol>
-  
   <%- klass.generic_fields.each do |field| -%>
     <%- if field.is_a? Hash -%>
       <%- attribute_name = field.keys.first.to_sym -%>
@@ -58,6 +57,8 @@
         <%- else -%>
           <%- if record.column_for_attribute(attribute_name).type == :text -%>
             <%= f.text_area attribute_name, :rows => 5, :cols => 60 %>
+          <%- elsif record.column_for_attribute(attribute_name).type == :date -%>
+            <%= f.calendar_date_select attribute_name %>
           <%- else -%>
             <%= f.text_field attribute_name %>
           <%- end -%>

data/app/views/generic_controller/index.erb

@@ -1,3 +1,6 @@
+<%- records ||= instance_variable_get("@#{@controller.class.to_s.demodulize.gsub("Controller", "").tableize}") -%>
+<%- class_name ||= @controller.class.to_s.demodulize.gsub("Controller", "").singularize.constantize -%>
+
 <%- if defined?(QUI::Toolbar) -%>
   <%- toolbar do |t| -%>
     <%- begin -%>
@@ -10,4 +13,18 @@
   <%- end -%>
 <%- end -%>
 
-<%= render :partial => "generic_controller/index_table" %>
+<%- if class_name.has_generic_named_scopes? -%>
+  <%- content_tag(:div, :class => "index_scopes") do -%>
+    <%- form_tag params, :method => :get do  -%>
+      <%- class_name.named_scopes.each do |identifier, options| -%>
+        <%- if options.has_key?(:generic) and options[:generic] == true -%>
+          <%= check_box_tag "scopes[]", identifier, params[:scopes] && params[:scopes].include?(identifier.to_s), :id => "scope_#{class_name}_#{identifier}" %>
+          <%= label_tag "scope_#{class_name}_#{identifier}", t(:"#{section}.scopes.#{class_name.to_s.tableize.singularize}.#{identifier}") %>
+        <%- end -%>
+      <%- end -%>
+      
+      <%= submit_tag t(:changeScopeAsAction), :class => "submit" %>
+    <%- end -%>
+  <%- end -%>
+<%- end -%>
+<%= render :partial => "generic_controller/index_table", :locals => { :records => records, :class_name => class_name } %>

data/lib/qm-acts-as-generic-controller-controller.rb

@@ -32,7 +32,21 @@ module QM
 
       module InstanceMethods
         def index
-          instance_variable_set(plural_variable, model.all) unless instance_variable_defined?(plural_variable)
+          unless instance_variable_defined?(plural_variable)
+            
+            if params[:scopes] and params[:scopes].is_a?(Array)
+              valid_scopes = params[:scopes].uniq.each{ |scope| scope if model.generic_named_scopes.has_key? scope.to_sym }.compact
+              if valid_scopes.size > 0
+                data = eval "model.#{valid_scopes.join(".")}"
+              else
+                data = model.all
+              end
+            else
+              data = model.all
+            end
+            
+            instance_variable_set(plural_variable, data) 
+          end
           
           respond_to do |format|
             format.html

data/lib/qm-acts-as-generic-controller-model.rb

@@ -32,6 +32,29 @@ module QM
 
           super association_id, options  
         end      
+        
+        def named_scopes
+          @named_scopes || {}
+        end
+
+        def generic_named_scopes
+          scopes = {}
+          named_scopes.each{ |i, o| scopes[i] = o if o.has_key?(:generic) and o[:generic] }
+          scopes
+        end
+        
+        def has_generic_named_scopes?
+          generic_named_scopes.size != 0
+        end
+        
+        def named_scope(name, options = {}, &block)
+          @named_scopes ||= {}
+          @named_scopes[name.to_sym] = options.dup
+          
+          options.delete(:generic) if options.is_a? Hash
+          
+          super name, options, &block
+        end
       
       
       

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qm-acts-as-generic-controller
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Marcin Lewandowski
@@ -62,6 +62,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: calendar_date_select
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: "qM: generates generic controller actions and views"
 email: marcin@saepia.net
 executables: []