netzke-basepack 0.5.2 → 0.5.3

data/lib/netzke/grid_panel_js.rb

@@ -79,22 +79,23 @@ module Netzke
               }
               
               // collect filters
-              if (c.withFilters){
-                filters.push({type:Ext.netzke.filterMap[c.editor.xtype], dataIndex:c.name});
-              }
+              // Not compatible with Ext 3.0
+              //if (c.withFilters){
+              //  filters.push({type:Ext.netzke.filterMap[c.editor.xtype], dataIndex:c.name});
+              //}
 
               if (c.editor && c.editor.xtype == 'checkbox') {
                 // Special case of checkbox column
-                var plugin = new Ext.grid.CheckColumn(c);
+                var plugin = new Ext.ux.grid.CheckColumn(c);
                 this.plugins.push(plugin);
                 cmConfig.push(plugin);
               } else {
-                // "normal" column, not a plugin
+                // a "normal" column, not a plugin
                 if (!c.readOnly && !this.prohibitUpdate) {
                   // c.editor contains complete config of the editor
                   var xtype = c.editor.xtype;
                   c.editor = Ext.ComponentMgr.create(Ext.apply({
-                    parentId:this.id,
+                    parentId: this.id,
                     name: c.name,
                     selectOnFocus:true
                   }, c.editor));
@@ -103,7 +104,8 @@ module Netzke
                 }
 
                 // set the renderer
-                c.renderer = Ext.netzke.normalizedRenderer(c.renderer);
+                var renderer = Ext.netzke.normalizedRenderer(c.renderer);
+                if (renderer != null) c.renderer = renderer;
                 
                 // add to the list
                 cmConfig.push(c);
@@ -113,14 +115,17 @@ module Netzke
 
             // Finally, create the ColumnModel based on processed columns
             this.cm = new Ext.grid.ColumnModel(cmConfig);
-            this.cm.on('hiddenchange', this.onColumnHiddenChange, this);
+            
+            // Hidden change event
+            if (this.persistentConfig) {this.cm.on('hiddenchange', this.onColumnHiddenChange, this);}
 
             /* ... and done with columns */
             
             // Filters
-            if (this.enableColumnFilters) {
-              this.plugins.push(new Ext.grid.GridFilters({filters:filters}));
-            }
+            // Not compatible with Ext 3.0
+            // if (this.enableColumnFilters) {
+            //  this.plugins.push(new Ext.grid.GridFilters({filters:filters}));
+            // }
             
             // Create Ext.data.Record constructor specific for our particular column configuration
             this.recordConfig = [];
@@ -196,9 +201,11 @@ module Netzke
             // Original initComponent
             Ext.netzke.cache.GridPanel.superclass.initComponent.call(this);
             
-            // Set the events
-            this.on('columnresize', this.onColumnResize, this);
-            this.on('columnmove', this.onColumnMove, this);
+            // Inform the server part about column operations
+            if (this.persistentConfig) {
+              this.on('columnresize', this.onColumnResize, this);
+              this.on('columnmove', this.onColumnMove, this);
+            }
             
             // Context menu
             if (this.enableContextMenu) {
@@ -246,7 +253,7 @@ module Netzke
       def js_extend_properties
         res = super
         
-        # Defaults
+        # Generic (non-optional) functionality
         res.merge!(
         {
           :track_mouse_over => true,
@@ -257,6 +264,166 @@ module Netzke
           
           :init_component => js_init_component.l,
           
+          # Handlers for actions
+          # 
+          
+          :on_add => <<-END_OF_JAVASCRIPT.l,
+            function(){
+              var rowConfig = {};
+              var r = new this.Row(rowConfig); // TODO: add default values
+              r.isNew = true; // to distinguish new records
+              r.set('id', r.id); // otherwise later r.get('id') returns empty string
+              this.stopEditing();
+              this.store.add(r);
+              this.tryStartEditing(this.store.indexOf(r));
+            }
+          END_OF_JAVASCRIPT
+  
+          :on_edit => <<-END_OF_JAVASCRIPT.l,
+            function(){
+              var row = this.getSelectionModel().getSelected();
+              if (row){
+                this.tryStartEditing(this.store.indexOf(row));
+              }
+            }
+          END_OF_JAVASCRIPT
+  
+          :on_del => <<-END_OF_JAVASCRIPT.l,
+            function() {
+              Ext.Msg.confirm('Confirm', 'Are you sure?', function(btn){
+                if (btn == 'yes') {
+                  var records = [];
+                  this.getSelectionModel().each(function(r){
+                    if (r.isNew) {
+                      // this record is not know to server - simply remove from store
+                      this.store.remove(r);
+                    } else {
+                      records.push(r.get('id'));
+                    }
+                  }, this);
+
+                  if (records.length > 0){
+                    // call API
+                    this.deleteData({records: Ext.encode(records)});
+                  }
+                }
+              }, this);
+            }
+          END_OF_JAVASCRIPT
+          
+          :on_apply => <<-END_OF_JAVASCRIPT.l,
+            function(){
+              var newRecords = [];
+              var updatedRecords = [];
+
+              Ext.each(this.store.getModifiedRecords(),
+                function(r) {
+                  if (r.isNew) {
+                    newRecords.push(Ext.apply(r.getChanges(), {id:r.get('id')}));
+                  } else {
+                    updatedRecords.push(Ext.apply(r.getChanges(), {id:r.get('id')}));
+                  }
+                }, 
+              this);
+        
+              if (newRecords.length > 0 || updatedRecords.length > 0) {
+                var params = {};
+
+                if (newRecords.length > 0) {
+                  params.created_records = Ext.encode(newRecords);
+                }
+                
+                if (updatedRecords.length > 0) {
+                  params.updated_records = Ext.encode(updatedRecords);
+                }
+                
+                if (this.store.baseParams !== {}) {
+                  params.base_params = Ext.encode(this.store.baseParams);
+                }
+                
+                this.postData(params);
+              }
+        
+            }
+          END_OF_JAVASCRIPT
+
+          # Handlers for tools
+          # 
+          
+          :on_refresh => <<-END_OF_JAVASCRIPT.l,
+            function() {
+              if (this.fireEvent('refresh', this) !== false) {
+                this.store.reload();
+              }
+            }
+          END_OF_JAVASCRIPT
+    
+          # Event handlers
+          # 
+          
+          :on_column_resize => <<-END_OF_JAVASCRIPT.l,
+            function(index, size){
+              this.resizeColumn({
+                index:index,
+                size:size
+              });
+            }
+          END_OF_JAVASCRIPT
+    
+          :on_column_hidden_change => <<-END_OF_JAVASCRIPT.l,
+            function(cm, index, hidden){
+              this.hideColumn({
+                index:index,
+                hidden:hidden
+              });
+            }
+          END_OF_JAVASCRIPT
+          
+          :on_column_move => <<-END_OF_JAVASCRIPT.l,
+            function(oldIndex, newIndex){
+              this.moveColumn({
+                old_index:oldIndex,
+                new_index:newIndex
+              });
+
+              var newRecordConfig = [];
+              Ext.each(this.getColumnModel().config, function(c){newRecordConfig.push({name: c.name})});
+              delete this.Row; // old record constructor
+              this.Row = Ext.data.Record.create(newRecordConfig);
+              this.getStore().reader.recordType = this.Row;
+            }
+          END_OF_JAVASCRIPT
+          
+          :on_row_context_menu => <<-END_OF_JAVASCRIPT.l,
+            function(grid, rowIndex, e){
+              e.stopEvent();
+              var coords = e.getXY();
+              
+              if (!grid.getSelectionModel().isSelected(rowIndex)) {
+                grid.getSelectionModel().selectRow(rowIndex);
+              }
+              
+              var menu = new Ext.menu.Menu({
+                items: this.contextMenu
+              });
+              
+              menu.showAt(coords);
+            }
+          END_OF_JAVASCRIPT
+          
+          :on_after_row_move => <<-END_OF_JAVASCRIPT.l,
+            function(dt, oldIndex, newIndex, records){
+          		var ids = [];
+          		// collect records ids
+          		Ext.each(records, function(r){ids.push(r.get('id'))});
+          		// call GridPanel's API
+          		this.moveRows({ids:Ext.encode(ids), new_index: newIndex});
+            }
+          END_OF_JAVASCRIPT
+          
+          # Other methods
+          # 
+          
           :load_exception_handler => <<-END_OF_JAVASCRIPT.l,
           function(proxy, options, response, error){
             if (response.status == 200 && (responseObject = Ext.decode(response.responseText)) && responseObject.flash){
@@ -285,63 +452,17 @@ module Netzke
             }
           END_OF_JAVASCRIPT
   
-          :add => <<-END_OF_JAVASCRIPT.l,
-            function(){
-              var rowConfig = {};
-              var r = new this.Row(rowConfig); // TODO: add default values
-              r.isNew = true; // to distinguish new records
-              r.set('id', r.id); // otherwise later r.get('id') returns empty string
-              this.stopEditing();
-              this.store.add(r);
-              this.tryStartEditing(this.store.indexOf(r));
-            }
-          END_OF_JAVASCRIPT
-  
-          :edit => <<-END_OF_JAVASCRIPT.l,
-            function(){
-              var row = this.getSelectionModel().getSelected();
-              if (row){
-                this.tryStartEditing(this.store.indexOf(row));
-              }
-            }
-          END_OF_JAVASCRIPT
-  
           # try editing the first editable (i.e. not hidden, not read-only) sell
           :try_start_editing => <<-END_OF_JAVASCRIPT.l,
             function(row){
-              if (row === null) {return;}
-              var editableColumns = this.getColumnModel().getColumnsBy(function(columnConfig, index){
-                return !columnConfig.hidden && !!columnConfig.editor;
+              var editableIndex = 0;
+              Ext.each(this.getColumnModel().config, function(c){
+                if (!c.hidden && c.editor && (c.editor.xtype !== 'checkbox')) {
+                  return false;
+                }
+                editableIndex++;
               });
-              var firstEditableColumn = editableColumns[0];
-              if (firstEditableColumn){
-                this.startEditing(row, firstEditableColumn.id);
-              }
-            }
-          END_OF_JAVASCRIPT
-
-          :del => <<-END_OF_JAVASCRIPT.l,
-            function() {
-              if (this.getSelectionModel().hasSelection()){
-                Ext.Msg.confirm('Confirm', 'Are you sure?', function(btn){
-                  if (btn == 'yes') {
-                    var records = [];
-                    this.getSelectionModel().each(function(r){
-                      if (r.isNew) {
-                        // this record is not know to server - simply remove from store
-                        this.store.remove(r);
-                      } else {
-                        records.push(r.get('id'));
-                      }
-                    }, this);
-
-                    if (records.length > 0){
-                      // call API
-                      this.deleteData({records: Ext.encode(records)});
-                    }
-                  }
-                }, this);
-              }
+              if (editableIndex < this.getColumnModel().config.length) {this.startEditing(row, editableIndex);}
             }
           END_OF_JAVASCRIPT
 
@@ -417,42 +538,6 @@ module Netzke
             }
           END_OF_JAVASCRIPT
           
-          :apply => <<-END_OF_JAVASCRIPT.l,
-            function(){
-              var newRecords = [];
-              var updatedRecords = [];
-
-              Ext.each(this.store.getModifiedRecords(),
-                function(r) {
-                  if (r.isNew) {
-                    newRecords.push(Ext.apply(r.getChanges(), {id:r.get('id')}));
-                  } else {
-                    updatedRecords.push(Ext.apply(r.getChanges(), {id:r.get('id')}));
-                  }
-                }, 
-              this);
-        
-              if (newRecords.length > 0 || updatedRecords.length > 0) {
-                var params = {};
-
-                if (newRecords.length > 0) {
-                  params.created_records = Ext.encode(newRecords);
-                }
-                
-                if (updatedRecords.length > 0) {
-                  params.updated_records = Ext.encode(updatedRecords);
-                }
-                
-                if (this.store.baseParams !== {}) {
-                  params.base_params = Ext.encode(this.store.baseParams);
-                }
-                
-                this.postData(params);
-              }
-        
-            }
-          END_OF_JAVASCRIPT
- 
           :select_first_row => <<-END_OF_JAVASCRIPT.l,
             function(){
               this.getSelectionModel().suspendEvents();
@@ -461,32 +546,6 @@ module Netzke
             }
           END_OF_JAVASCRIPT
           
-          :refresh => <<-END_OF_JAVASCRIPT.l,
-            function() {
-              if (this.fireEvent('refresh', this) !== false) {
-                this.store.reload();
-              }
-            }
-          END_OF_JAVASCRIPT
-    
-          :on_column_resize => <<-END_OF_JAVASCRIPT.l,
-            function(index, size){
-              this.resizeColumn({
-                index:index,
-                size:size
-              });
-            }
-          END_OF_JAVASCRIPT
-    
-          :on_column_hidden_change => <<-END_OF_JAVASCRIPT.l,
-            function(cm, index, hidden){
-              this.hideColumn({
-                index:index,
-                hidden:hidden
-              });
-            }
-          END_OF_JAVASCRIPT
-    
           # :reorder_columns => <<-END_OF_JAVASCRIPT.l,
           #   function(columns){
           #     columnsInNewShipment = [];
@@ -497,46 +556,10 @@ module Netzke
           #     this.store.reader.recordType = newRecordType; // yes, recordType is a protected property, but that's the only way we can do it, and it seems to work for now
           #   }
           # END_OF_JAVASCRIPT
-    
-          :on_column_move => <<-END_OF_JAVASCRIPT.l,
-            function(oldIndex, newIndex){
-              this.moveColumn({
-                old_index:oldIndex,
-                new_index:newIndex
-              });
-            }
-          END_OF_JAVASCRIPT
-          
-          :on_row_context_menu => <<-END_OF_JAVASCRIPT.l,
-            function(grid, rowIndex, e){
-              e.stopEvent();
-              var coords = e.getXY();
-              
-              if (!grid.getSelectionModel().isSelected(rowIndex)) {
-                grid.getSelectionModel().selectRow(rowIndex);
-              }
-              
-              var menu = new Ext.menu.Menu({
-                items: this.contextMenu
-              });
-              
-              menu.showAt(coords);
-            }
-          END_OF_JAVASCRIPT
-          
-          :on_after_row_move => <<-END_OF_JAVASCRIPT.l,
-            function(dt, oldIndex, newIndex, records){
-          		var ids = [];
-          		// collect records ids
-          		Ext.each(records, function(r){ids.push(r.get('id'))});
-          		// call GridPanel's API
-          		this.moveRows({ids:Ext.encode(ids), new_index: newIndex});
-            }
-          END_OF_JAVASCRIPT
         }
         )
         
-        # Edit in form
+        # Optional edit in form functionality
         res.merge!(
         {
           :on_successfull_record_creation => <<-END_OF_JAVASCRIPT.l,
@@ -554,7 +577,7 @@ module Netzke
             }
           END_OF_JAVASCRIPT
 
-          :edit_in_form => <<-END_OF_JAVASCRIPT.l,
+          :on_edit_in_form => <<-END_OF_JAVASCRIPT.l,
             function(){
               // create the window
               delete this.editFormWindow;
@@ -567,12 +590,12 @@ module Netzke
                 buttons:[{
                   text: 'OK',
                   handler: function(){
-                    this.ownerCt.getWidget().apply();
+                    this.ownerCt.ownerCt.getWidget().onApply();
                   }
                 },{
                   text:'Cancel',
                   handler:function(){
-                    this.ownerCt.close();
+                    this.ownerCt.ownerCt.close();
                   }
                 }]
               });
@@ -617,7 +640,7 @@ module Netzke
             }
           END_OF_JAVASCRIPT
 
-          :add_in_form => <<-END_OF_JAVASCRIPT.l,
+          :on_add_in_form => <<-END_OF_JAVASCRIPT.l,
             function(){
               if (!this.formWindow) {
                 this.formWindow = new Ext.Window({
@@ -630,12 +653,12 @@ module Netzke
                   buttons:[{
                     text: 'OK',
                     handler: function(){
-                      this.ownerCt.getWidget().apply();
+                      this.ownerCt.ownerCt.getWidget().onApply();
                     }
                   },{
                     text:'Cancel',
                     handler:function(){
-                      this.ownerCt.close();
+                      this.ownerCt.ownerCt.close();
                     }
                   }]
                 });
@@ -654,10 +677,10 @@ module Netzke
         }
         ) if config[:edit_in_form_available]
         
-        # Extended search
+        # Optional extended search functionality
         res.merge!(
         {
-          :search => <<-END_OF_JAVASCRIPT.l,
+          :on_search => <<-END_OF_JAVASCRIPT.l,
             function(){
               if (!this.searchWindow){
                 this.searchWindow = new Ext.Window({
@@ -670,12 +693,12 @@ module Netzke
                   buttons:[{
                     text: 'OK',
                     handler: function(){
-                      this.ownerCt.closePositively();
+                      this.ownerCt.ownerCt.closePositively();
                     }
                   },{
                     text:'Cancel',
                     handler:function(){
-                      this.ownerCt.closeNegatively();
+                      this.ownerCt.ownerCt.closeNegatively();
                     }
                   }],
                   closePositively : function(){