lipsiadmin 4.1.3 → 4.1.4

data/CHANGELOG

@@ -1,3 +1,25 @@
+2009-05-28
+  * Refactored account_access now current_account (account logged) is aviable in our roles
+  * Fix a typo in column_model
+  * Little refactoring in account model because now mapping is not necessary
+  * Improved Ext Components, now for example we can render in the same page multiple components without conflicts
+  * Removed some unusued methods
+  * Reject nil values from Ext Configuration
+  * Fixed raising errors in grid editor
+  * Updated controller generator, now accept ajax request
+
+2009-05-27
+  * Added new column renderer see: http://api.lipsiadmin.com/classes/Lipsiadmin/Ext/ColumnModel.html
+  * Added a new datetime editor
+  * Litte fix in AccountAccess.roles now return empty array if no roles instead rescue an error
+
+2009-05-26
+  * Fixed validates_attachment_content_type_for, now accepts correctly regex
+  * Added a attachment_tag for autogenerate html for upload one file/image
+  * Added a attachemnts_tag autogenerate html for upload multiple file/image and order them
+  * Added a open_standard_grid for simplify use of ext window with ours grids.
+  * Improved attachment generator
+
 2009-05-21
   * Removed some grids defaults
   * Added attacher_name in before_save

data/Rakefile

@@ -75,7 +75,7 @@ end
 
 desc "Publish the API documentation"
 task :pdoc => [:rdoc] do 
-  Rake::SshDirPublisher.new("root@lipsiasoft.net", "/mnt/www/apps/lipsiadmin/doc", "doc").upload
+  Rake::SshDirPublisher.new("root@lipsiasoft.net", "/mnt/www/apps/lipsiasoft/doc", "doc").upload
 end
 
 desc "Publish the release files to RubyForge."

data/lib/access_control/authentication.rb

@@ -39,8 +39,10 @@ module Lipsiadmin
         # 
         # For configure this role please refer to: <tt>Lipsiadmin::AccessControl::Base</tt>
         def allowed?
-          allowed = current_account.maps.collect(&:allowed)[0]
-          denied  = current_account.maps.collect(&:denied)[0]
+          maps = AccountAccess.maps_for(current_account)
+          
+          allowed = maps.collect(&:allowed).flatten.uniq
+          denied  = maps.collect(&:denied).flatten.uniq
           
           allow = allowed.find do |a|
             a[:controller] == params[:controller] &&
@@ -80,7 +82,7 @@ module Lipsiadmin
             format.js { render(:update) { |page| page.alert "You don't allowed to access to this javascript" } }
           end
           false
-        end  
+        end
 
         def store_location#:nodoc:
           session[:return_to] = request.request_uri

data/lib/access_control/base.rb

@@ -13,7 +13,7 @@ module Lipsiadmin
     # 
     #   Examples:
     #   
-    #     roles_for :administrator do |role|
+    #     roles_for :administrator do |role, current_account|
     #       role.allow_all_actions "/backend/base"
     #       role.deny_action_of    "/backend/accounts/details"
     #     
@@ -24,6 +24,12 @@ module Lipsiadmin
     #           end
     #         end
     #       end
+    # 
+    #       role.project_module :categories do |project|
+    #         current_account.categories.each do |cat|
+    #           project.menu cat.name, "/backend/categories/#{cat.id}.js"
+    #         end
+    #       end
     #     end
     # 
     #   If a user logged with role administrator or that have a project_module administrator can:
@@ -32,6 +38,7 @@ module Lipsiadmin
     #   - Denied access to ONLY action <tt>"/backend/accounts/details"</tt>
     #   - Access to a project module called Administration
     #   - Access to all actions of the controller "/backend/settings"
+    #   - Access to all actions of the controller "/backend/categories"
     #   - Access to all actions EXCEPT <tt>details</tt> of controller "/backend/accounts"
     # 
     class Base
@@ -44,35 +51,17 @@ module Lipsiadmin
           @mappers ||= []
           @roles   ||= []
           @roles.concat(roles)
-          @mappers << Mapper.new(*roles, &block)
-        end        
+          @mappers << Proc.new { |account| Mapper.new(account, *roles, &block) }
+        end
         
         # Returns all roles
         def roles
-          @roles.collect(&:to_s)
+          @roles.nil? ? [] : @roles.collect(&:to_s)
         end
         
-        # Returns all project modules ids
-        def project_modules
-          @mappers.inject([]) do |pm, maps|
-            pm.concat(maps.project_modules.collect(&:uid))
-          end.uniq
-        end
-        
-        # Returns maps for a given role
-        def find_by_role(role)
-          role = case role
-            when String then role.downcase.to_sym
-            when Symbol then role
-          end
-          return @mappers.find_all { |m| m.roles.include?(role.to_sym) }
-        end
-      
-        # Returns maps for a given project modules uids
-        def find_by_project_modules(*uids)
-          uids.inject([]) do |maps, uid|
-            maps.concat @mappers.find_all { |m| m.project_modules.collect(&:uid).include?(uid.to_s) }
-          end
+        def maps_for(account)
+          @mappers.collect { |m| m.call(account) }.
+                   reject  { |m| !m.allowed? }
         end
       end
       
@@ -82,12 +71,14 @@ module Lipsiadmin
       include Helper
       attr_reader :project_modules, :roles
       
-      def initialize(*roles, &block)#:nodoc:
+      def initialize(account, *roles, &block)#:nodoc:
         @project_modules = []
         @allowed         = []
         @denied          = []
         @roles           = roles
-        yield self
+        @account         = account
+        # Mantain backward compatibility
+        yield(self, @account) rescue yield(self)
       end
       
       # Create a new project module
@@ -115,15 +106,25 @@ module Lipsiadmin
         @denied << { :controller => recognize_path(path)[:controller] }
       end
       
+      # Return true if current_account role is included in given roles
+      def allowed?
+        @roles.any? { |r| r.to_s.downcase == @account.role.downcase }
+      end
+      
       # Return allowed actions/controllers
       def allowed
-        @project_modules.each { |pm| @allowed.concat pm.allowed  }
-        return @allowed.uniq
+        # I know is a double check but is better 2 times that no one.
+        if allowed?
+          @project_modules.each { |pm| @allowed.concat pm.allowed  }
+          @allowed.uniq
+        else 
+          []
+        end
       end
       
       # Return denied actions/controllers
       def denied
-        return @denied.uniq
+        @denied.uniq
       end
     end
     
@@ -151,13 +152,13 @@ module Lipsiadmin
       
       # Return allowed controllers
       def allowed
-        @menus.each { |m| @allowed.concat m.allowed  }
-        return @allowed.uniq
+        @menus.each { |m| @allowed.concat(m.allowed) }
+        @allowed.uniq
       end
       
       # Return the original name or try to translate or humanize the symbol
       def human_name
-        return @name.is_a?(Symbol) ? I18n.t("backend.menus.#{@name}", :default => @name.to_s.humanize) : @name
+        @name.is_a?(Symbol) ? I18n.t("backend.menus.#{@name}", :default => @name.to_s.humanize) : @name
       end
       
       # Return a unique id for the given project module
@@ -170,7 +171,7 @@ module Lipsiadmin
         options = @options.merge(:text => human_name)
         options.merge!(:menu => @menus.collect(&:config)) if @menus.size > 0
         options.merge!(:handler =>  "function(){ Backend.app.load('#{url_for(@url.merge(:only_path => true))}') }".to_l) if @url
-        return options
+        options
       end
     end
     
@@ -199,12 +200,12 @@ module Lipsiadmin
       # Return allowed controllers
       def allowed
         @items.each { |i| @allowed.concat i.allowed }
-        return @allowed.uniq
+        @allowed.uniq
       end
       
       # Return the original name or try to translate or humanize the symbol
       def human_name
-        return @name.is_a?(Symbol) ? I18n.t("backend.menus.#{@name}", :default => @name.to_s.humanize) : @name
+        @name.is_a?(Symbol) ? I18n.t("backend.menus.#{@name}", :default => @name.to_s.humanize) : @name
       end
       
       # Return a unique id for the given project module
@@ -214,10 +215,14 @@ module Lipsiadmin
       
       # Return ExtJs Config for this menu
       def config
-        options = @options.merge(:text => human_name)
-        options.merge!(:menu => @items.collect(&:config)) if @items.size > 0
-        options.merge!(:handler => "function(){ Backend.app.load('#{url_for(@url.merge(:only_path => true))}') }".to_l) if @url
-        return options
+        if @url.blank?
+          options = human_name
+        else
+          options = @options.merge(:text => human_name)
+          options.merge!(:menu => @items.collect(&:config)) if @items.size > 0
+          options.merge!(:handler => "function(){ Backend.app.load('#{url_for(@url.merge(:only_path => true))}') }".to_l)
+        end
+        options
       end
     end
     

data/lib/data_base/attachment.rb

@@ -347,8 +347,8 @@ module Lipsiadmin
           valid_types = []
           args.each do |variable|
             case variable
-              when String then valid_types << variable
               when Hash   then options.merge!(variable)
+              else valid_types << variable
             end
           end
           attachment_definitions[name][:validations][:content_type] = lambda do |attachment, instance|

data/lib/data_base/attachment/attach.rb

@@ -43,7 +43,6 @@ module Lipsiadmin
       def options
         @options ||= {
           :whiny_thumbnails  => false,
-          :image_magick_path => nil,
           :command_path      => nil,
           :log               => true,
           :swallow_stderr    => true
@@ -83,9 +82,6 @@ module Lipsiadmin
       end
       
       def path_for_command(command)#:nodoc:
-        if options[:image_magick_path]
-          warn("[DEPRECATION] :image_magick_path is deprecated and will be removed. Use :command_path instead")
-        end
         path = [options[:command_path] || options[:image_magick_path], command].compact
         File.join(*path)
       end

data/lib/version.rb

@@ -2,7 +2,7 @@ module Lipsiadmin
   module VERSION #:nodoc:
     MAJOR = 4
     MINOR = 1
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/view/helpers/backend_helper.rb

@@ -153,12 +153,168 @@ module Lipsiadmin
         
         # Generate the menu from the Lispiadmin::AccessControl
         def backend_menu
-          config = current_account.maps.collect(&:project_modules)[0].collect(&:config)
+          config = AccountAccess.maps_for(current_account).collect(&:project_modules).flatten.uniq.collect(&:config)
           config << { :text => I18n.t("backend.menus.help", :default => "Help"), :handler => "function() { Backend.app.openHelp() }".to_l }
           return config.to_json
         end
+
+        # Returns html for upload one image or generic file.
+        # 
+        # Options can be one of the following:
+        # 
+        # <tt>:image</tt>::     Indicate if the attachments are ONLY images.
+        # 
+        # Examples:
+        # 
+        #   class Category < ActiveRecord::Base
+        #     has_one_attachments    :file,   :dependent => :destroy
+        #   ...
+        # 
+        # Then in our view we can simply add this:
+        # 
+        #   attachments_tag(:category, :file)
+        # 
+        # Remember that al labels can be translated. See Locales for Backend.
+        # 
+        def attachment_tag(object_name, method, options={})
+          variable = instance_variable_get("@#{object_name}")
+          html     = []
+          html    << '<!-- Generated from Lipsiadmin -->'
+          html    << '<ul id="' + "#{method}-order" + '" class="label">'
+
+          if attachment = variable.send(method)
+            # Create first the remove link
+            remove_link = link_to_remote(tl(:remove), :url => "/backend/attachments/#{attachment.id}", 
+                                                      :method => :delete, 
+                                                      :success => "$('#{method}_#{attachment.id}').remove();")
+
+            if options[:image]
+              fstyle  = "float:left;margin:5px;margin-left:0px;"
+              fclass  = "box-image"
+              ftag    = '<div>' + image_tag(attachment.url(:thumb)) + '</div>'
+              ftag   += '<div style="text-align:center;padding:5px;cursor:pointer">'
+              ftag   += '  ' + remove_link
+              ftag   += '</div>'
+            else
+              fstyle  = "padding:5px;border-bottom:1px solid #DDE7F5;"
+              fclass  = "box-file"
+              ftag    = '<div style="float:left;cursor:pointer">'
+              ftag   += ' ' + link_to(attachment.attached_file_name, attachment.url) + ' ' + number_to_human_size(attachment.attached_file_size)
+              ftag   += '</div>'
+              ftag   += '<div style="float:right;cursor:pointer">'
+              ftag   += '  ' + remove_link
+              ftag   += '</div>'
+              ftag   += '<br style="clear:both" />'
+            end
+
+            html << '<li id="' + "#{method}_#{attachment.id}" + '" class="' + fclass + '" style="' + fstyle + '">'
+            html << ' ' + ftag
+            html << '</li>'
+          end # End of Loop
+
+          html << '</ul>'
+          html << '<br style="clear:both" />'
+
+          flbl = options[:image] ? :upload_image : :upload_file
+          html << '<div class="label-title">' + tl(flbl) + '</div>'
+          html << '<table>'
+          rowa  = '  <tr class="attachment">'
+          rowa << '    <td>' + human_name_for(:attachment, :attached_file_name) + '</td>'
+          rowa << '    <td>' + file_field_tag("category[#{method}_attributes][file]", :style => "width:250px") + '</td>'
+          rowa << '  </tr>'
+          html << rowa
+          html << '</table>'
+          html.join("\n")
+        end
         
-        # Open a new windows that can contain a grid that you can reuse
+        # Returns html for upload multiple images or generic files.
+        # 
+        # Options can be one of the following:
+        # 
+        # <tt>:image</tt>::     Indicate if the attachments are ONLY images.
+        # <tt>:order</tt>::     Indicate if user can order files.
+        # 
+        # Examples:
+        # 
+        #   class Category < ActiveRecord::Base
+        #     has_many_attachments    :images,   :dependent => :destroy
+        #     validates_attachment_content_type_for :images, /^image/
+        #   ...
+        # 
+        # Then in our view we can simply add this:
+        # 
+        #   attachments_tag(:category, :images, :image => true, :order => true)
+        # 
+        # Remember that al labels can be translated. See Locales for Backend.
+        # 
+        def attachments_tag(object_name, method, options={})
+          variable = instance_variable_get("@#{object_name}")
+          html     = []
+          html    << '<!-- Generated from Lipsiadmin -->'
+          html    << '<ul id="' + "#{method}-order" + '" class="label">'
+
+          for attachment in variable.send(method).all(:order => :position)
+            # Create first the remove link
+            remove_link = link_to_remote(tl(:remove), :url => "/backend/attachments/#{attachment.id}", 
+                                                      :method => :delete, 
+                                                      :success => "$('#{method}_#{attachment.id}').remove();")
+
+            if options[:image]
+              fstyle  = "float:left;margin:5px;margin-left:0px;"
+              fstyle += "cursor:move;" if options[:order]
+              fclass  = "box-image"
+              ftag    = '<div>' + image_tag(attachment.url(:thumb)) + '</div>'
+              ftag   += '<div style="text-align:center;padding:5px;cursor:pointer">'
+              ftag   += '  ' + remove_link
+              ftag   += '</div>'
+            else
+              fstyle  = "padding:5px;border-bottom:1px solid #DDE7F5;"
+              fstyle += "cursor:move;" if options[:order]
+              fclass  = "box-file"
+              ftag    = '<div style="float:left;cursor:pointer">'
+              ftag   += ' ' + link_to(attachment.attached_file_name, attachment.url) + ' ' + number_to_human_size(attachment.attached_file_size)
+              ftag   += '</div>'
+              ftag   += '<div style="float:right;cursor:pointer">'
+              ftag   += '  ' + remove_link
+              ftag   += '</div>'
+              ftag   += '<br style="clear:both" />'
+            end
+
+            html << '<li id="' + "#{method}_#{attachment.id}" + '" class="' + fclass + '" style="' + fstyle + '">'
+            html << ' ' + ftag
+            html << '</li>'
+          end # End of Loop
+
+          html << '</ul>'
+          html << '<br style="clear:both" />'
+
+          if options[:order]
+            constraint = options[:image] ? "horizontal" : "vertical"
+            html << '<div id="' + "#{method}-message" + '" style="padding:5px">&nbsp;</div>'
+            html << sortable_element("#{method}-order", :url => "/backend/attachments/order", :update => "#{method}-message", :constraint => constraint,
+                                                        :complete => visual_effect(:highlight, "#{method}-message", :duration => 0.5))
+          end
+
+          flbl = options[:image] ? :upload_images : :upload_files
+          html << '<div class="label-title">'+ tl(flbl) +'</div>'
+          html << '<table>'
+          rowa  = '  <tr class="attachment">'
+          rowa << '    <td>' + human_name_for(:attachment, :attached_file_name) + '</td>'
+          rowa << '    <td>' + file_field_tag("category[#{method}_attributes][][file]", :style => "width:250px") + '</td>'
+          rowa << '    <td>' + link_to_function(tl(:remove), "this.up('.attachment').remove()") + '</td>'
+          rowa << '  </tr>'
+          html << rowa
+          html << ' <tr id="' + "add-#{method}" + '">'
+          html << '  <td colspan="2">&nbsp;</td>'
+          html << '  <td style="padding-top:15px">'
+          html << '     ' + link_to_function(tl(:add)) { |page| page.insert_html(:before, "add-#{method}", rowa) }
+          html << '  </td>'
+          html << ' </tr>'
+          html << '</table>'
+          html.join("\n")
+        end
+
+        # Build a new windows that can contain an existent grid
         # 
         # The first argument name is used as the link text.
         # 
@@ -187,12 +343,11 @@ module Lipsiadmin
         #   #     }
         #   #   }).show();
         #   #   return false;" href="#">Select a Category</a>
-        # 
-        #   open_grid "Select a Category", "/backend/categories.js", "gridPanel",
+        #   build_grid "Select a Category", "/backend/categories.js", "gridPanel",
         #     :update => "$('post_category_ids').value = selections.collect(function(s) { return s.id }).join(',');" +
         #     "$('category_names').innerHTML = selections.collect(function(s) { return s.data['categories.name'] }).join(', ');"
         # 
-        def open_grid(text, url, grid, options={})
+        def build_grid(text, url, grid, options={})
           options[:before] = options[:before] + ";" if options[:before]
           javascript = <<-JAVASCRIPT
             #{options[:before]}
@@ -206,7 +361,45 @@ module Lipsiadmin
               }
             }).show()
           JAVASCRIPT
-          link_to_function(text, javascript)
+          link_to_function(text, javascript.gsub(/\n|\s+/, " "))
+        end
+        alias_method :open_grid, :build_grid
+
+        # Open a Standard window that can contain a standard existent grid
+        # 
+        # Options can be one of the following:
+        # 
+        # <tt>:grid</tt>::       The name of the grid var. Default "gridPanel"
+        # <tt>:url</tt>::        The url where the grid is stored. Default is autogenerated.
+        # <tt>:name</tt>::       The name of the link that open the window grid. Default a image.
+        # 
+        #   # Generates: <a onclick="
+        #   #   new Backend.window({ 
+        #   #     url: '/backend/suppliers.js', 
+        #   #     grid: 'gridPanel', 
+        #   #     listeners: {  
+        #   #       selected: function(win, selections){  
+        #   #         $('warehouse_supplier_id').value = selections.first().id; 
+        #   #         $('warehouse_supplier_name').innerHTML = selections.first().data['suppliers.name']  
+        #   #       }  
+        #   #     }  
+        #   #   }).show(); return false;">
+        #   # <img alt="New" src="/images/backend/new.gif?1242655402" style="vertical-align:bottom" /></a>
+        #   # <input id="warehouse_supplier_id" name="warehouse[supplier_id]" type="hidden" value="16" />
+        #   open_standard_grid :warehouse, :supplier, :id, :name
+        #
+        def open_standard_grid(object_name, ext_object, value, display, options={})
+          current_value       = instance_variable_get("@#{object_name}").send(ext_object).send(display) rescue "Nessuno"
+          value_field         = value.to_s.downcase == "id" ? "id" : "data['#{ext_object.to_s.pluralize}.#{value}']"
+          options[:grid]    ||= "gridPanel"
+          options[:url]     ||= "/backend/#{ext_object.to_s.pluralize}.js"
+          options[:name]    ||= image_tag("backend/new.gif", :style => "vertical-align:bottom")
+          update_function     = "$('#{object_name}_#{ext_object}_#{value}').value = selections.first().#{value_field}; " + 
+                                "$('#{object_name}_#{ext_object}_#{display}').innerHTML = selections.first().data['#{ext_object.to_s.pluralize}.#{display}']"
+
+          content_tag(:span, current_value, :id => "#{object_name}_#{ext_object}_#{display}" ) + ' ' +
+          build_grid(options[:name], options[:url], options[:grid], :update => update_function) +
+          hidden_field(object_name, "#{ext_object}_#{value}")
         end
 
         # Open a new windows that can contain a form that you can reuse
@@ -250,7 +443,7 @@ module Lipsiadmin
               }
             }).show()
           JAVASCRIPT
-          link_to_function(text, javascript)
+          link_to_function(text, javascript.gsub(/\n/, " "))
         end
         
         # This method call a remote_function and in the same time do a 

data/lib/view/helpers/ext/column_model.rb

@@ -35,7 +35,7 @@ module Lipsiadmin
       
       # This add automatically fields from an array
       def fields(fields)
-        fields.each { |options| add(nil, nil, options)  }
+        fields.each { |options| add(nil, nil, options); }
       end
       
       # Add columns to a Ext.grid.ColumnModel
@@ -55,8 +55,17 @@ module Lipsiadmin
       #   :renderer => :us_money
       #   # Generates: Ext.util.Format.boolRenderer
       #   :renderer => :boolean
+      #   ...
+      #   :render => :capitalize
+      #   :render => :file_size
+      #   :render => :downcase
+      #   :render => :trim
+      #   :render => :undef
+      #   :render => :upcase
       # 
-      # You can pass :edit_with_###
+      # For more see http://extjs.com/deploy/dev/docs/?class=Ext.util.Format
+      # 
+      # You can pass :editor
       # 
       #   # Generates: { checkbox: true }
       #   :editor => { :xtype => :checkbox, :someConfig => true }
@@ -88,19 +97,20 @@ module Lipsiadmin
       # 
       def add(name=nil, data=nil, options={})
         options[:header] = name if name
-        options[:dataIndex] = data if date
+        options[:dataIndex] = data if data
         
         if options[:editor]
           xtype = options[:editor].delete(:xtype)
           case xtype
-            when :checkbox    then options.delete(:editor); options.merge!(:checkbox => true)
-            when :combo       then options.merge!(:editor => l("new Ext.form.ComboBox(#{Configuration.new(options[:editor]).to_s(3)})"))
-            when :datefield   then options.merge!(:editor => l("new Ext.form.DateField(#{Configuration.new(options[:editor]).to_s(3)})"))
-            when :numberfield then options.merge!(:editor => l("new Ext.form.NumberField(#{Configuration.new(options[:editor]).to_s(3)})"))
-            when :radio       then options.merge!(:editor => l("new Ext.form.Radio(#{Configuration.new(options[:editor]).to_s(3)})"))
-            when :textarea    then options.merge!(:editor => l("new Ext.form.TextArea(#{Configuration.new(options[:editor]).to_s(3)})"))
-            when :textfield   then options.merge!(:editor => l("new Ext.form.TextField(#{Configuration.new(options[:editor]).to_s(3)})"))
-            when :timefield   then options.merge!(:editor => l("new Ext.form.TimeField(#{Configuration.new(options[:editor]).to_s(3)})"))
+            when :checkbox      then options.delete(:editor); options.merge!(:checkbox => true)
+            when :combo         then options.merge!(:editor => l("new Ext.form.ComboBox(#{Configuration.new(options[:editor]).to_s(3)})"))
+            when :datefield     then options.merge!(:editor => l("new Ext.form.DateField(#{Configuration.new(options[:editor]).to_s(3)})"))
+            when :numberfield   then options.merge!(:editor => l("new Ext.form.NumberField(#{Configuration.new(options[:editor]).to_s(3)})"))
+            when :radio         then options.merge!(:editor => l("new Ext.form.Radio(#{Configuration.new(options[:editor]).to_s(3)})"))
+            when :textarea      then options.merge!(:editor => l("new Ext.form.TextArea(#{Configuration.new(options[:editor]).to_s(3)})"))
+            when :textfield     then options.merge!(:editor => l("new Ext.form.TextField(#{Configuration.new(options[:editor]).to_s(3)})"))
+            when :timefield     then options.merge!(:editor => l("new Ext.form.TimeField(#{Configuration.new(options[:editor]).to_s(3)})"))
+            when :datetimefield then options.merge!(:editor => l("new Ext.form.DateTimeField(#{Configuration.new(options[:editor]).to_s(3)})"))
           end
         end
         
@@ -110,10 +120,17 @@ module Lipsiadmin
           when :eur_money   then options.merge!(:renderer => l("Ext.util.Format.eurMoney"))
           when :us_money    then options.merge!(:renderer => l("Ext.util.Format.usMoney"))
           when :boolean     then options.merge!(:renderer => l("Ext.util.Format.boolRenderer"))
+          when :capitalize  then options.merge!(:renderer => l("Ext.util.Format.capitalize"))
+          when :file_size   then options.merge!(:renderer => l("Ext.util.Format.fileSize"))
+          when :downcase    then options.merge!(:renderer => l("Ext.util.Format.lowercase"))
+          when :trim        then options.merge!(:renderer => l("Ext.util.Format.trim"))
+          when :undef       then options.merge!(:renderer => l("Ext.util.Format.undef"))
+          when :upcase      then options.merge!(:renderer => l("Ext.util.Format.uppercase"))
         end
         
         raise ComponentError, "You must provide header and dataIndex for generate a column model" if options[:header].blank? || 
                                                                                                      options[:dataIndex].blank?
+
         config[:columns] << Configuration.new(options)
       end
     end

data/lib/view/helpers/ext/component.rb

@@ -17,7 +17,9 @@ module Lipsiadmin#:nodoc:
     class Component      
 
       def initialize(klass, options={}, &block)#:nodoc:
-        @klass = klass
+        @klass  = klass
+        @prefix = options.delete(:prefix)
+        @var    = options.delete(:var)
         @config = Configuration.new(options)
         @before, @after = [], []
       
@@ -45,10 +47,11 @@ module Lipsiadmin#:nodoc:
       #      
       def get_var
         # I will nillify obj if they are blank
-        @var = nil     if @var == ""
-        @config[:var]  if @config[:var] == ""
+        @var = nil            if @var == ""
+        @config.delete(:var)  if @config[:var] == ""
         # Return a correct var
-        @var || @config[:var] || (@klass.split(".").last.demodulize.slice(0..0).downcase + @klass.split(".").last.demodulize.slice(1..-1))
+        current_var = (@var || @config[:var] || build_var)
+        @prefix.to_s + current_var.to_s
       end
       
       # Write the the configuration of object from an hash
@@ -71,6 +74,14 @@ module Lipsiadmin#:nodoc:
         end
       end
       
+      # Set the prefix for the var of the component.
+      # This is usefull when for example we are using two grids 
+      # for solve conflict problems.
+      # 
+      def prefix=(value)
+        @prefix = value
+      end
+      
       # Returns an array of javascripts to add before component is rendered.
       #      
       def before
@@ -165,11 +176,6 @@ module Lipsiadmin#:nodoc:
       alias_method :l, :literal
 
       private
-        def javascript_object_for(object)
-          object.respond_to?(:to_json) ? object.to_json : object.inspect
-        end
-        alias_method :s, :javascript_object_for
-        
         def render_javascript(template, assigns)
           assigns.each { |key, value| instance_variable_set("@#{key}", value) }
           template = File.read("#{File.dirname(__FILE__)}/templates/#{template}.js.erb")
@@ -178,6 +184,7 @@ module Lipsiadmin#:nodoc:
         
         def add_object(name, object)
           if object.class == Component || object.class.superclass == Component
+            object.prefix = get_var
             @before.delete_if { |b| b.start_with?("var #{object.get_var} = new") }
             @before << object.to_s
             @config[name.to_sym] = l(object.get_var)
@@ -185,6 +192,17 @@ module Lipsiadmin#:nodoc:
             @config[name.to_sym] = object
           end
         end
+        
+        def build_var
+          returning "" do |val|
+            if @prefix.blank?
+              val << @klass.split(".").last.demodulize.slice(0..0).downcase
+              val << @klass.split(".").last.demodulize.slice(1..-1)
+            else
+              val << @klass.split(".").last.demodulize
+            end
+          end
+        end
     end
   end
 end

data/lib/view/helpers/ext/configuration.rb

@@ -16,7 +16,7 @@ module Lipsiadmin
         return if self.empty?
         i = ("  "*indent)
         s = self.size > 0 ? "\n" : "  "
-        "{#{s}" + self.collect { |k,v| "#{i*2}#{k}: #{s(v)}" if k != :var }.join(",#{s}") + "#{s}#{i}}"
+        "{#{s}" + self.reject { |k,v| k.blank? || v.to_s.blank? }.collect { |k,v| "#{i*2}#{k}: #{s(v)}" if k != :var }.join(",#{s}") + "#{s}#{i}}"
       end
       
       private

data/lib/view/helpers/ext/grid.rb

@@ -48,7 +48,7 @@ module Lipsiadmin
     #     ...
     # 
     class Grid < Component
-
+      
       def initialize(options={}, &block)#:nodoc:
         # Call Super Class for initialize configuration
         @editable = options.delete(:editable)
@@ -65,7 +65,7 @@ module Lipsiadmin
         sm                    :checkbox
         add_plugin            l("new Ext.grid.Search()")
         view                  :default
-        
+        render                true
         # We need to add a setTimeout because, we destroy
         # the grid before loading a new page/js.
         on(:dblclick) do |p|
@@ -97,8 +97,8 @@ module Lipsiadmin
       end
       
       # Define the title of the grid
-      def title(title)
-        before << "Backend.app.setTitle(#{title.to_json});"
+      def title(title, global=true)
+        global ? (before << "Backend.app.setTitle(#{title.to_json});") :  config[:title] = title
       end
       
       # Assign plugins for the current grid
@@ -203,6 +203,15 @@ module Lipsiadmin
         add_object(:cm, cm)
       end
       
+      
+      # Define if the grid need to be added to
+      #   
+      #   Backend.app.addItem(#{get_var});
+      # 
+      def render(value)
+        @render = value
+      end
+      
       # The base_path used for ToolBar, it's used for generate [:new, :edit, :destory] urls
       def base_path(value)
         @base_path = value
@@ -270,13 +279,13 @@ module Lipsiadmin
           after << render_javascript(:grid_functions, :var => get_var, :store => config[:store], :sm => config[:sm], :tbar => config[:tbar], :editable => @editable)
         end
         
-        if config[:store]
+        if config[:store] && @render
           after << "#{config[:store]}.on('beforeload', function(){ Backend.app.mask(); });"
           after << "#{config[:store]}.on('load', function(){ Backend.app.unmask(); });"
           after << "#{config[:store]}.load();"
         end
         
-        after << "Backend.app.addItem(#{get_var});"
+        after << "Backend.app.addItem(#{get_var});" if @render
         
         super
       end

data/lib/view/helpers/ext/templates/grid_functions.js.erb

@@ -43,20 +43,20 @@
   var column    = <%= @var %>.getColumnModel().getColumnById(columnId);
 
   Ext.Ajax.request({
-    url: '<%= @base_path %>/'+e.record.id,
+    url: '<%= @base_path %>/'+e.record.id+".json",
     method: 'PUT',
     params: column.name+'='+e.value,
     success: function(result, request){
-      var resultValue = Ext.decode(result.responseText); 
+      var resultValue = Ext.decode(result.responseText);
       if (resultValue.success == true){
         e.record.commit();
       } else {
-        Ext.MessageBox.alert(Lipsiadmin.locale.alert.title, resultValue.msg);
+        Ext.Msg.alert(Backend.locale.messages.alert.title, resultValue.msg);
         e.record.reject();
       }
     },                
     failure: function(result, request) {
-      Ext.Msg.alert(Lipsiadmin.locale.alert.title, Lipsiadmin.locale.alert.msg);
+      Ext.Msg.alert(Backend.locale.messages.alert.title, Lipsiadmin.locale.alert.msg);
       e.record.reject();
     }
   });

data/lipsiadmin_generators/attachment/attachment_generator.rb

@@ -6,7 +6,11 @@ class AttachmentGenerator < Rails::Generator::Base
       unless options[:skip_migration]
         m.migration_template("migration.rb", "db/migrate", :migration_file_name => "create_attachments")
       end
+      m.append("config/routes.rb", "    backend.resources :attachments, :collection => { :order => :post }", "map.namespace(:backend) do |backend|")
+      m.directory('app/controllers/backend')
+      m.directory('app/models')
       m.template('model.rb', 'app/models/attachment.rb')
+      m.template('controller.rb', 'app/controllers/backend/attachments_controller.rb')
       m.readme "../REMEMBER"      
     end
   end 

data/lipsiadmin_generators/attachment/templates/controller.rb

@@ -0,0 +1,71 @@
+class Backend::AttachmentsController < BackendController
+
+  def index
+    params[:limit] ||= 50
+    
+    @column_store = column_store_for Attachment do |cm|
+      cm.add :attacher_type
+      cm.add :attached_file_name
+      cm.add :attached_content_type
+      cm.add :attached_file_size
+      cm.add :position
+      cm.add :created_at, :renderer => :datetime 
+      cm.add :updated_at, :renderer => :datetime 
+    end
+    
+    respond_to do |format|
+      format.js 
+      format.json do
+        render :json => @column_store.store_data(params)
+      end
+    end
+  end
+
+  
+  def new
+    @attachment = Attachment.new
+  end
+
+  def create
+    @attachment = Attachment.new(params[:attachment])
+    if @attachment.save
+      redirect_parent_to(:action => "edit", :id => @attachment)
+    else
+      render_to_parent(:action => "new")
+    end
+  end
+
+  def edit
+    @attachment = Attachment.find(params[:id])
+  end
+
+  def update
+    @attachment = Attachment.find(params[:id])    
+    if @attachment.update_attributes(params[:attachment])
+      redirect_parent_to(:action => "edit", :id => @attachment)
+    else
+      render_to_parent(:action => "edit")
+    end 
+  end
+  
+  def order
+    # We Need to search the correct params
+    ordering = params.find { |k,v| k.to_s =~ /-order$/ }[1]
+    ordering.each_with_index do |id, index|
+      Attachment.find(id).update_attributes(:position => index)
+    end
+    render :text => I18n.t("backend.texts.order_updated", :default => "Order Updated!")
+  rescue
+    render :text => "Params for ordering not found, call it some-order"
+  end
+  
+  # Add in your model before_destroy and if the callback returns false, 
+  # all the later callbacks and the associated action are cancelled.
+  def destroy
+    if Attachment.find(params[:id]).destroy
+      render :json => { :success => true } 
+    else
+      render :json => { :success => false, :msg => I18n.t("backend.general.cantDelete") }
+    end
+  end
+end

data/lipsiadmin_generators/attachment/templates/migration.rb

@@ -1,10 +1,12 @@
 class CreateAttachments < ActiveRecord::Migration
   def self.up
     create_table :attachments, :force => true do |t|
-      t.string     :attached_file_name, :attached_content_type
+      t.string     :attached_file_name, 
+      t.string     :attached_content_type
       t.integer    :attached_file_size
-      t.references :attacher, :polymorphic => true
+      t.references :attacher,             :polymorphic => true
       t.string     :attacher_name
+      t.integer    :position,             :default => 1
       t.timestamps
     end
   end

data/lipsiadmin_generators/backend/templates/config/locales/backend/en.yml

@@ -18,6 +18,16 @@ en:
       list: "List"
       new: "New"
       help: "Help"
+    labels:
+      none: "Nothing"
+      add: "Add"
+      remove: "Remove"
+      upload_file: "Upload File"
+      upload_files: "Upload Files"
+      upload_image: "Upload Image"
+      upload_images: "Upload Images"
+    texts: 
+      order_updated: Order updated!
     javascripts:
       buttons:
         add: "Add"

data/lipsiadmin_generators/backend/templates/config/locales/backend/it.yml

@@ -17,6 +17,16 @@ it:
       account: "Account"
       list: "Elenco"
       new: "Nuovo"
+    labels:
+      none: "Nessuno"
+      add: "Aggiungi"
+      remove: "Rimuovi"
+      upload_file: "Carica File"
+      upload_files: "Carica Files"
+      upload_image: "Carica Immagine"
+      upload_images: "Carica Immagini"
+    texts: 
+      order_updated: L'ordine è stato aggiornato!
     javascripts:
       buttons:
         add: "Aggiungi"

data/lipsiadmin_generators/backend/templates/models/account.rb

@@ -1,4 +1,5 @@
 require 'digest/sha1'
+require 'openssl'
 class Account < ActiveRecord::Base
   # Virtual attribute for the unencrypted password
   attr_accessor :password
@@ -86,19 +87,6 @@ class Account < ActiveRecord::Base
   def authenticated?(password)
     crypted_password.chomp == encrypt(password).chomp rescue false
   end
-
-  # Gets the project modules for this accounts
-  def maps
-    if modules && modules.split(",").size > 0
-      maps = AccountAccess.find_by_project_modules(modules.split(","))
-      return maps unless maps.blank?
-    end
-    
-    if !role.blank?
-      maps = AccountAccess.find_by_role(role)
-      return maps unless maps.blank?
-    end
-  end
   
   # Generate Methods takes from AccessControl rules
   # Example:

data/lipsiadmin_generators/backend/templates/models/account_access.rb

@@ -1,6 +1,6 @@
 class AccountAccess < Lipsiadmin::AccessControl::Base 
 
-  roles_for :administrator do |role|
+  roles_for :administrator do |role, current_account|
     # Shared Permission
     role.allow_all_actions "/backend"
     role.allow_all_actions "/backend/base"
@@ -17,6 +17,8 @@ class AccountAccess < Lipsiadmin::AccessControl::Base
     # 
     #   role.project_module "My Menu Name"
     # 
+    # <tt>current_account</tt> is an instance of current logged account
+    # 
     role.project_module :account do |project|
       project.menu :list,   "/backend/accounts.js" do |submenu|
         submenu.add :new, "/backend/accounts/new"

data/lipsiadmin_generators/backend_page/templates/controller.rb

@@ -41,12 +41,19 @@ class Backend::<%= controller_class_name %>Controller < BackendController
   end
 
   def update
-    @<%= singular_name %> = <%= model_name %>.find(params[:id])    
+    @<%= singular_name %> = <%= model_name %>.find(params[:id]) 
+    
     if @<%= singular_name %>.update_attributes(params[:<%= singular_name %>])
-      redirect_parent_to(:action => "edit", :id => @<%= singular_name %>)
+      respond_to do |format|
+        format.html { redirect_parent_to(:action => "edit", :id => @<%= singular_name %>) }
+        format.json { render :json => { :success => true } }
+      end
     else
-      render_to_parent(:action => "edit")
-    end 
+      respond_to do |format|
+        format.html { render_to_parent(:action => "edit") }
+        format.json { render :json => { :success => false, :msg => @<%= singular_name %>.errors.full_messages.join("<br />") } }
+      end
+    end
   end
   
   # Add in your model before_destroy and if the callback returns false, 

data/lipsiadmin_generators/backend_page/templates/view_index.rjs.erb

@@ -9,6 +9,7 @@ page.grid do |grid|
   grid.store do |store|
     store.url "/backend/<%= plural_name %>.json"
     store.fields @column_store.store_fields
+    # store.sortInfo  :field => "<%= plural_name %>.created_at", :direction => "DESC"
   end
   grid.columns do |columns|
     columns.fields @column_store.column_fields

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lipsiadmin
 version: !ruby/object:Gem::Version 
-  version: 4.1.3
+  version: 4.1.4
 platform: ruby
 authors: 
 - Davide D'Agostino
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-21 00:00:00 +02:00
+date: 2009-06-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,7 @@ files:
 - init.rb
 - lipsiadmin_generators/attachment/attachment_generator.rb
 - lipsiadmin_generators/attachment/REMEMBER
+- lipsiadmin_generators/attachment/templates/controller.rb
 - lipsiadmin_generators/attachment/templates/migration.rb
 - lipsiadmin_generators/attachment/templates/model.rb
 - lipsiadmin_generators/backend/backend_generator.rb