lipsiadmin 3.4.2 → 4.0.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+2009-05-11
+  * Bumped version to 4.0.0
+  * Refactored backend.js so javascript in tabs are evalued after render so you can interact with tabs
+  * Refactored Backend.window so now you can do much more with your grids/forms. See rdoc for examples.
+  * Small refactor to attachment processor, now original attachments are saved without "_original_" in the filename.
+
 2009-05-07
   * Fixed a problem with WithoutTable
   * Removed unusued routes

data/lib/controller/ext.rb

@@ -78,6 +78,9 @@ module Lipsiadmin
             end.join(",")
           end
           
+          # Adding a name for our column
+          options[:name] ||= "#{@model.table_name.singularize}[#{options[:method]}]"
+          
           # Reformat query
           if options[:method].is_a?(Symbol)
             options[:dataIndex] ||= "#{@model.table_name}.#{options[:method]}"

data/lib/data_base/attachment/attach.rb

@@ -115,7 +115,7 @@ module Lipsiadmin
           :path          => ":rails_root/public/uploads/:id_:style_:basename.:extension",
           :styles        => {},
           :default_url   => "/images/backend/no-image.png",
-          :default_style => :normal,
+          :default_style => :original,
           :validations   => {},
           :storage       => :filesystem
         }
@@ -486,9 +486,9 @@ module Lipsiadmin
         interpolations = self.class.interpolations.sort{|a,b| a.first.to_s <=> b.first.to_s }
         interpolations.reverse.inject( pattern.dup ) do |result, interpolation|
           tag, blk = interpolation
-          result.gsub(/:#{tag}/) do |match|
-            blk.call( self, style )
-          end
+          match    = blk.call(self, style)
+          # If we use tag original we dont want to add :original to filename or url
+          tag == :style && match == :original ? result.gsub(/:style_/, "") : result.gsub(/:#{tag}/, match.to_s)
         end
       end
 

data/lib/version.rb

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

data/lib/view/helpers/backend_helper.rb

@@ -47,22 +47,99 @@ module Lipsiadmin
           return config.to_json
         end
         
+        # Open a new windows that can contain a grid that you can reuse
+        # 
+        # The first argument name is used as the link text.
+        # 
+        # The second argument is the url where js of grid are stored.
+        # 
+        # The third argument is the name of the gird var usually gridPanel or editorGridPanel.
+        # 
+        # The four argument are callbacks that may be specified:
+        # 
+        # <tt>:before</tt>::     Called before request is initiated.
+        # <tt>:update</tt>::     Called after user press +select+ button.
+        #                        This call are performed in an handler where
+        #                        you have access to two variables:
+        #                        <tt>:win</tt>::  Backend.window
+        #                        <tt>:selections</tt>::  Records selected in the grid
+        # 
+        #   # Generates: <a onclick="      
+        #   #   new Backend.window({ 
+        #   #     url: '/backend/categories.js', 
+        #   #     grid: 'gridPanel',  
+        #   #     listeners: {
+        #   #       selected: function(win, selections){
+        #   #         $('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(', ');
+        #   #       }
+        #   #     }
+        #   #   }).show();
+        #   #   return false;" href="#">Select a Category</a>
+        # 
+        #   open_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={})
+          options[:before] = options[:before] + ";" if options[:before]
+          javascript = <<-JAVASCRIPT
+            #{options[:before]}
+            new Backend.window({ 
+              url: '#{url}', 
+              grid: '#{grid}',  
+              listeners: {
+                selected: function(win, selections){
+                  #{options[:update]}
+                }
+              }
+            }).show()
+          JAVASCRIPT
+          link_to_function(text, javascript)
+        end
+
         # Open a new windows that can contain a form that you can reuse
         # 
-        #   Example:
-        #     
-        #     # in app/views/dossiers/_form.html.haml
-        #         %tr
-        #           %td{:style=>"width:100px"} 
-        #             %b Customer:
-        #           %td
-        #             %span{:id => :account_name}=@dossier.account ? @dossier.account.full_name : "None" 
-        #             =hidden_field :dossier, :account_id
-        #             =open_window "/backend/accounts.js", :id, :name, :dossier_account_id, :account_name
-        # 
-        def open_window(url, value, display, render_value_to, render_display_to)
-          link_to_function(image_tag("backend/new.gif", :style=>"vertical-align:bottom"), 
-            "Backend.window.open({url:'#{url}', display:'#{display}', value:'#{value}', displayField:'#{render_display_to}', valueField:'#{render_value_to}'})")
+        # The first argument name is used as the link text.
+        # 
+        # The second argument is the url where html of form are stored.
+        # 
+        # The third argument are callbacks that may be specified:
+        # 
+        # <tt>:before</tt>::     Called before request is initiated.
+        # <tt>:update</tt>::     Called after user press +save+ button.
+        #                        This call are performed in an handler where
+        #                        you have access to one variables:
+        #                        <tt>:win</tt>::  Backend.window
+        # 
+        #   # Generates: <a onclick="  
+        #   #     new Backend.window({ 
+        #   #       url: '/backend/posts/'+$('comment_post_id').value+'/edit', 
+        #   #       form: true,
+        #   #       listeners: {
+        #   #         saved: function(win){
+        #   #           someFn();
+        #   #         }
+        #   #       }
+        #   #     }).show();
+        #   # return false;" href="#">Edit Post</a>
+        #   open_form "Edit Post", "/backend/posts/'+$('comment_post_id').value+'/edit", :update => "someFn();"
+        #   
+        def open_form(text, url, options={})
+          options[:before] = options[:before] + ";" if options[:before]
+          javascript = <<-JAVASCRIPT
+            #{options[:before]}
+            new Backend.window({ 
+              url: '#{url}', 
+              form: true,
+              listeners: {
+                saved: function(win){
+                  #{options[:update]}
+                }
+              }
+            }).show()
+          JAVASCRIPT
+          link_to_function(text, javascript)
         end
         
         # This method call a remote_function and in the same time do a 

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

@@ -56,9 +56,54 @@ module Lipsiadmin
       #   # Generates: Ext.util.Format.boolRenderer
       #   :renderer => :boolean
       # 
+      # You can pass :edit_with_###
+      # 
+      #   # Generates: { checkbox: true }
+      #   :editor => { :xtype => :checkbox, :someConfig => true }
+      #   # Generates: new Ext.form.ComboBox({ someConfig => true });
+      #   :editor => { :xtype => :combo, :someConfig => true }
+      #   # Generates: new Ext.form.DateField({ someConfig => true });
+      #   :editor => { :xtype => :datefield, :someConfig => true }
+      #   # Generates: new Ext.form.NumberField({ someConfig => true });
+      #   :editor => { :xtype => :numberfield, :someConfig => true }
+      #   # Generates: new Ext.form.Radio({ someConfig => true });
+      #   :editor => { :xtype => :radio, :someConfig => true }
+      #   # Generates: new Ext.form.TextArea({ someConfig => true });
+      #   :editor => { :xtype => :textarea, :someConfig => true }
+      #   # Generates: new Ext.form.TextField({ someConfig => true });
+      #   :editor => { :xtype => :textfield, :someConfig => true }
+      #   # Generates: new Ext.form.TimeField({ someConfig => true });
+      #   :editor => { :xtype => :timefield, :someConfig => true }
+      # 
+      #   Form components so are:
+      #   ---------------------------------------
+      #   :checkbox      =>   Ext.form.Checkbox
+      #   :combo         =>   Ext.form.ComboBox
+      #   :datefield     =>   Ext.form.DateField
+      #   :numberfield   =>   Ext.form.NumberField
+      #   :radio         =>   Ext.form.Radio
+      #   :textarea      =>   Ext.form.TextArea
+      #   :textfield     =>   Ext.form.TextField
+      #   :timefield     =>   Ext.form.TimeField
+      # 
       def add(name=nil, data=nil, options={})
         options[:header] = name if name
-        options[:dataIndex] = data if data
+        options[:dataIndex] = data if date
+        
+        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)})"))
+          end
+        end
+        
         case options[:renderer]
           when :date        then options.merge!(:renderer => l("Ext.util.Format.dateRenderer()"))
           when :datetime    then options.merge!(:renderer => l("Ext.util.Format.dateTimeRenderer()"))
@@ -66,7 +111,9 @@ module Lipsiadmin
           when :us_money    then options.merge!(:renderer => l("Ext.util.Format.usMoney"))
           when :boolean     then options.merge!(:renderer => l("Ext.util.Format.boolRenderer"))
         end
-        raise ComponentError, "You must provide header and dataIndex for generate a column model" if options[:header].blank? || options[:dataIndex].blank?
+        
+        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/grid.rb

@@ -38,10 +38,22 @@ module Lipsiadmin
     #     grid.bbar  :store => grid.get_store, :pageSize => params[:limit]
     #   end
     # 
+    #   # Returns:
+    #   #   var grid = new Ext.grid.EditorGridPanel({
+    #   #     clicksToEdit: 1,
+    #   #   ...
+    #
+    #   page.grid :editable => true do |grid|
+    #     grid.id "grid-posts"
+    #     ...
+    # 
     class Grid < Component
+
       def initialize(options={}, &block)#:nodoc:
         # Call Super Class for initialize configuration
-        super("Ext.grid.GridPanel", options)
+        @editable = options.delete(:editable)
+        
+        super("Ext.grid.#{@editable ? 'EditorGridPanel' : 'GridPanel' }", options)
 
         # Write default configuration if not specified
         config[:plugins]      ||= []
@@ -255,7 +267,7 @@ module Lipsiadmin
         end
         
         if @default_tbar
-          after << render_javascript(:grid_functions, :var => get_var, :store => config[:store], :sm => config[:sm], :tbar => config[:tbar])
+          after << render_javascript(:grid_functions, :var => get_var, :store => config[:store], :sm => config[:sm], :tbar => config[:tbar], :editable => @editable)
         end
         
         if config[:store]

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

@@ -13,6 +13,56 @@
    }
 });
 
+<% if @editable %>
+<%= @var %>.on('cellmousedown', function(grid, rowIndex, colIndex, e){
+  var columnId  = grid.getColumnModel().getColumnId(colIndex);
+  var column    = grid.getColumnModel().getColumnById(columnId);
+  var t         = e.getTarget();
+
+  if(column.checkbox && t.className && t.className.indexOf('x-grid3-cc-'+t.id) != -1){
+    e.stopEvent();
+    var record    = grid.store.getAt(rowIndex);
+    var editEvent = {
+      grid: grid,
+      record: grid.store.getAt(rowIndex),
+      field: column.dataIndex,
+      value: !record.data[column.dataIndex],
+      originalValue: record.data[column.dataIndex],
+      row: rowIndex,
+      column: grid.getColumnModel().findColumnIndex(column.dataIndex)
+    };
+    record.set(column.dataIndex, editEvent.value);
+    grid.getSelectionModel().selectRow(rowIndex);
+    grid.fireEvent('afteredit', editEvent);
+  }
+});
+
+
+<%= @var %>.on('afteredit', function(e){
+  var columnId  = <%= @var %>.getColumnModel().getColumnId(e.column);
+  var column    = <%= @var %>.getColumnModel().getColumnById(columnId);
+
+  Ext.Ajax.request({
+    url: '<%= @base_path %>/'+e.record.id,
+    method: 'PUT',
+    params: column.name+'='+e.value,
+    success: function(result, request){
+      var resultValue = Ext.decode(result.responseText); 
+      if (resultValue.success == true){
+        e.record.commit();
+      } else {
+        Ext.MessageBox.alert(Lipsiadmin.locale.alert.title, resultValue.msg);
+        e.record.reject();
+      }
+    },                
+    failure: function(result, request) {
+      Ext.Msg.alert(Lipsiadmin.locale.alert.title, Lipsiadmin.locale.alert.msg);
+      e.record.reject();
+    }
+  });
+});
+<% end %>
+
 function add(){
   Backend.app.load('<%= @new_path.blank? ? "#{@base_path}/new" : @new_path %>');
 }

data/lib/view/helpers/ext_helper.rb

@@ -141,8 +141,8 @@ module Lipsiadmin
         #     grid.bbar  :store => grid.get_store, :pageSize => params[:limit]
         #   end
         # 
-        def grid(&block)
-          self << Lipsiadmin::Ext::Grid.new(&block)
+        def grid(options={}, &block)
+          self << Lipsiadmin::Ext::Grid.new(options, &block)
         end
       end
     end

data/lipsiadmin_generators/backend/templates/views/javascripts/backend.js.erb

@@ -30,6 +30,7 @@ Backend.app = function(){
           contentEl:'header',
           region:'north',
           border: false,
+          height: 65,
           bbar: new Ext.Toolbar({ cls:'x-toolbar-menu', items: [<%= backend_menu %>] })
         });
       }
@@ -61,12 +62,16 @@ Backend.app = function(){
       return window.location.search ? Ext.urlDecode(window.location.search.substring(1)).small : false;
     }, // small
     
+    toolbar: function(){
+      return window.location.search ? Ext.urlDecode(window.location.search.substring(1)).toolbar : false;
+    }, // hideToolbar
+    
     load : function(url, cache){
       var ext = (/[.]/.exec(url)) ? /[^.]+$/.exec(url) : 'html';
       var cache = (cache && cache == true) || false;
       
       if (!cache){ Backend.cache.clear(); }
-      
+
       if (ext.length == 1 && ext[0].toLowerCase() == 'js') {
         // Clean the cache
         this.clean();
@@ -81,10 +86,11 @@ Backend.app = function(){
           } 
         });
       } else if (ext == 'html'){
-        this.contentDynamic.getUpdater().update({ url: url, headers: { 'Accept': 'text/html, text/javascript, application/xml, text/xml, */*' } });
+        this.contentDynamic.getUpdater().update({ url: url, scripts: false, headers: { 'Accept': 'text/html, text/javascript, application/xml, text/xml, */*' } });
       } else {
         Ext.Msg.alert(Backend.locale.messages.alert.title, Backend.locale.messages.alert.message);
       }
+      this.contentDynamic.addEvents('inspection');
     }, // load
     
     back: function(){
@@ -106,6 +112,7 @@ Backend.app = function(){
     clean : function(){
       this.mask();
       this.contentDynamic.body.update('');
+      this.contentDynamic.items.each(function(i){ i.destroy(); });
       this.contentDynamic.removeAll(true);
       this.contentDynamic.doLayout();
     }, // clean
@@ -113,9 +120,6 @@ Backend.app = function(){
     addItem : function(item){
       this.contentDynamic.add(item);
       this.contentDynamic.doLayout();
-      if (this.smallView()){
-        window.parent.Backend.window.item = item;
-      }
     }, // addItem
     
     submitForm : function(){
@@ -148,7 +152,12 @@ Backend.app = function(){
       if (tabs.elements.length > 0){
         // Build Tabs
         var items = tabs.elements.collect(function(tab){
-          return { id: tab.id, contentEl: tab.id, title: tab.title };
+          var editable = tab.getAttribute('htmleditor');
+          if (editable) {
+            return { id: tab.id, autoScroll:false, title: tab.title, items: { xtype: 'htmleditor', id: editable, enableFont: false, value: tab.getAttribute('value') } };
+          } else {
+            return { id: tab.id, contentEl: tab.id, title: tab.title };
+          }
         });
 
         // Get ActiveTab
@@ -156,29 +165,69 @@ Backend.app = function(){
         
         // Get The container, this code is redundant, but is a trick for ie.
         var container = Ext.get(tabs.elements[0].id).parent().id;
-
-        // Build TabPanel
-        var tabPanel = new Ext.TabPanel({
+        
+        var tabConfig = {
           applyTo: container,
           layoutOnTabChange:true,
           activeTab: activeTab,
           border:false,
           region:'center',
           items: items,
-          bbar: [{ 
-            text: Backend.locale.buttons.back, 
-            cls: 'x-btn-text-icon back', 
-            handler: Backend.app.back 
-          }, '->',{ 
-            text: Backend.locale.buttons.save, 
-            cls: 'x-btn-text-icon save', 
-            handler: Backend.app.submitForm 
-          }],
           defaults: { autoScroll:true, layout:'fit' }
-        });
+        }
         
+        if (this.toolbar()!="1"){
+          Ext.apply(tabConfig, {
+            bbar: [{ 
+              text: Backend.locale.buttons.back, 
+              cls: 'x-btn-text-icon back', 
+              handler: Backend.app.back 
+            }, '->',{ 
+              text: Backend.locale.buttons.save, 
+              cls: 'x-btn-text-icon save', 
+              handler: Backend.app.submitForm 
+            }]
+          });
+        }
+
+        // Build TabPanel
+        var tabPanel = new Ext.TabPanel(tabConfig);
         this.addItem(tabPanel);
+        // Need to use this because some times we add tabs from inline scripts
+        tabPanel.on('add', function(){ tabPanel.setActiveTab(activeTab) });
+      }
+      
+      // Now we can load scripts
+      var html = el.dom.innerHTML;
+      var id = Ext.id();
+      var dom = this.contentDynamic.body.dom;
+      
+      var hd = document.getElementsByTagName("head")[0];
+      var re = /(?:<script([^>]*)?>)((\n|\r|.)*?)(?:<\/script>)/ig;
+      var srcRe = /\ssrc=([\'\"])(.*?)\1/i;
+      var typeRe = /\stype=([\'\"])(.*?)\1/i;
+
+      var match;
+      while(match = re.exec(html)){
+        var attrs = match[1];
+        var srcMatch = attrs ? attrs.match(srcRe) : false;
+        if(srcMatch && srcMatch[2]){
+          var s = document.createElement("script");
+          s.src = srcMatch[2];
+          var typeMatch = attrs.match(typeRe);
+          if(typeMatch && typeMatch[2]){
+            s.type = typeMatch[2];
+          }
+          hd.appendChild(s);
+        }else if(match[2] && match[2].length > 0){
+          if(window.execScript) {
+            window.execScript(match[2]);
+          } else {
+            window.eval(match[2]);
+          }
+        }
       }
+      
       this.unmask();
     },//inspectContent
     
@@ -267,63 +316,64 @@ Backend.app = function(){
   } // return
 }();
 
-Backend.window = function(){
-  return {
-    current: undefined, // currentWindow
-    item: undefined, // item
-    config: undefined, // config
-    open: function(config){
-      if (this.current) { this.current.close(); }
-      this.config = config;
-      this.current = new Ext.Window({
-        width: 700,
-        height: 300,
-        layout: 'fit',
-        autoScroll: true,
-        modal: true,
-        resizable: true,
-        maximizable: true,
-        bodyStyle: 'background-color:#FFF',
-        buttons:[{
-          text: Backend.locale.buttons.close,
-          handler: this.close
-        },{
-          text: Backend.locale.buttons.select,
-          handler: this.select
-        }],
-        html: '<iframe id="'+Ext.id('','iframe-')+'" src="/backend/base/?small=1&load='+config.url+'" frameBorder="0" width="100%" height="100%" />'
-      });
-      this.current.show();
-      return this.current
-    }, // open
-    
-    close: function(){
-      if (Backend.window.current){
-        Backend.window.current.close();
-        Backend.window.item   = undefined;
-        Backend.window.config = undefined;
-      }
-    }, // close
-    
-    select: function(){
-      try {
-        var selected =  Backend.window.item.getSelectionModel().getSelected();
-        var config   =  Backend.window.config;
-        var name = selected.data[config.display];
-        if (config.value=='id'){
-          var id = selected.id;
-        } else {
-          var id = selected.data[config.value];
-        }
-        $(config.displayField).update(name);
-        $(config.valueField).value = id;
-        Backend.window.close();
-      } catch(e) {
-        Ext.Msg.alert(Backend.locale.messages.alert.title, Backend.locale.messages.alert.notSelected);
-      }
-    } // select
-  } // return
-}();
+Backend.window = Ext.extend(Ext.Window, {
+  width: 700,
+  height: 300,
+  layout: 'fit',
+  autoScroll: true,
+  modal: true,
+  maximizable: true,
+  bodyStyle: 'background-color:#FFF',
+  grid: undefined,
+  form: false,
+  url: '',
+  iframeId: Ext.id('','iframe-'),
+  initComponent : function(){
+    Backend.window.superclass.initComponent.call(this);
+    this.addEvents('selected');
+    this.addEvents('saved');
+    this.addButton({
+      text: Backend.locale.buttons.close,
+      handler: this[this.closeAction].createDelegate(this, [])      
+    });
+    if (this.grid){
+      this.addButton({
+        text: Backend.locale.buttons.select,
+        handler: this.closeWithSelections.createDelegate(this, [])}
+      );
+    }
+    if (this.form){
+      this.addButton({
+        text: Backend.locale.buttons.save,
+        handler: this.saveForm.createDelegate(this, [])}
+      );
+    }
+    this.html = '<iframe id="'+this.iframeId+'" src="/backend/base/?small=1&toolbar='+(this.form?1:0)+'&load='+this.url+'" frameBorder="0" width="100%" height="100%" />';
+  }, // initComponent
+  
+  afterShow : function(afterShow){
+    Backend.window.superclass.afterShow.call(this);
+    this.contentWindow = Ext.fly(this.iframeId).dom.contentWindow;
+  }, // onRender
+  
+  getSelections: function(){
+    return this.contentWindow[this.grid].getSelectionModel().getSelections();
+  }, // getSelections
+  
+  closeWithSelections: function(){
+    if (this.getSelections().length > 0){
+      this.fireEvent('selected', this, this.getSelections());
+      this[this.closeAction]();
+    } else { 
+      Ext.Msg.alert(Backend.locale.messages.alert.title, Backend.locale.messages.alert.notSelected); 
+    }
+  }, // closeWithSelections
+  
+  saveForm: function(){
+    this.contentWindow.Backend.app.submitForm();
+    this.fireEvent('saved', this);
+  } // saveForm
+});
 
 Backend.cache = function(){
   return {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lipsiadmin
 version: !ruby/object:Gem::Version 
-  version: 3.4.2
+  version: 4.0.0
 platform: ruby
 authors: 
 - Davide D'Agostino
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-07 00:00:00 +02:00
+date: 2009-05-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency