knitkit 2.0.5 → 2.0.6

data/public/javascripts/erp_app/desktop/applications/knitkit/module.js

@@ -17,7 +17,8 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit",{
         //***********************************************************
         var desktop = this.app.getDesktop();
         var win = desktop.getWindow('knitkit');
-        this.centerRegion = new Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion();
+        var centerRegion = Ext.create('Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion');
+		this.centerRegion = centerRegion;
         if(!win){
             win = desktop.createWindow({
                 id: 'knitkit',
@@ -31,6 +32,69 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit",{
                 animCollapse:false,
                 constrainHeader:true,
                 layout: 'border',
+                tbar:{
+                    items:[
+                        {
+							iconCls:'btn-save',
+							text:'Save',
+                            handler:function(btn){
+                                centerRegion.saveCurrent();
+                            }
+                        },
+						{
+							iconCls:'btn-save-all',
+							text:'Save All',
+                            handler:function(btn){
+                                centerRegion.saveAll();    
+                            }
+                        },
+						'->',
+                        {
+							iconCls:'btn-left-panel',
+                            handler:function(btn){
+                                var panel = btn.up('window').down('knitkit_westregion');
+                                if(panel.collapsed){
+                                    panel.expand();
+                                }
+                                else{
+                                    panel.collapse(Ext.Component.DIRECTION_LEFT);
+                                }
+                            }
+                        },
+                        {
+							iconCls:'btn-right-panel',
+                            handler:function(btn){
+                                var panel = btn.up('window').down('knitkit_eastregion');
+                                if(panel.collapsed){
+                                    panel.expand();
+                                }
+                                else{
+                                    panel.collapse(Ext.Component.DIRECTION_RIGHT);
+                                }
+                            }
+                        },
+                        {
+							iconCls:'btn-left-right-panel',
+                            handler:function(btn){
+                                var east = btn.up('window').down('knitkit_eastregion');
+                                var west = btn.up('window').down('knitkit_westregion');
+                                if(west.collapsed || east.collapsed){
+									west.expand();
+									east.expand();
+								}
+								else
+								if(!west.collapsed && !east.collapsed){
+                                    var task = new Ext.util.DelayedTask(function(){
+                                        west.collapse(Ext.Component.DIRECTION_LEFT);
+                                    });
+                                    east.collapse(Ext.Component.DIRECTION_RIGHT);
+                                    task.delay(400);
+
+								}
+                            }
+                        }
+                    ]
+                },
                 items:[
                 this.centerRegion,
                 {

data/public/javascripts/erp_app/desktop/applications/knitkit/section_articles_grid_panel.js

@@ -31,135 +31,159 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.SectionArticlesGridPanel
     
   editArticle : function(record){
     var self = this;
-    var addFormItems = self.addFormItems;
-        
-    var editArticleWindow = Ext.create("Ext.window.Window",{
-      layout:'fit',
-      width:375,
-      title:'Edit Article',
-      plain: true,
-      buttonAlign:'center',
-      items: {
-        xtype: 'form',
-        labelWidth: 110,
-        frame:false,
-        bodyStyle:'padding:5px 5px 0',
-        width: 425,
-        url:'/knitkit/erp_app/desktop/articles/update/' + self.sectionId,
-        defaults: {
-          width: 225
-        },
-        items: [
-        {
-          xtype:'textfield',
-          fieldLabel:'Title',
-          allowBlank:false,
-          name:'title',
-          value: record.get('title')
-        },
-        {
-          xtype:'radiogroup',
-          fieldLabel:'Display title?',
-          name:'display_title',
-          columns:2,
-          items:[
-          {
-            boxLabel:'Yes',
-            name:'display_title',
-            inputValue: 'yes',
-            checked:record.get('display_title')
-          },
-          {
-            boxLabel:'No',
-            name:'display_title',
-            inputValue:'no',
-            checked:!record.get('display_title')
-          }]
-        },
-        {
-          xtype:'textfield',
-          fieldLabel:'Unique Name',
-          allowBlank:true,
-          name:'internal_identifier',
-          value: record.get('internal_identifier')
-        },
-        addFormItems,
-        {
-          xtype: 'displayfield',
-          fieldLabel: 'Created At',
-          name: 'created_at',
-          value: record.data.created_at
-        },
-        {
-          xtype: 'displayfield',
-          fieldLabel: 'Updated At',
-          name: 'updated_at',
-          value: record.data.updated_at
-        }
-        ]
-      },
-      listeners:{
-        'show':function(){
-          if (Ext.getCmp('record_id')){
-            Ext.getCmp('record_id').setValue(record.get('id'));
-          }
-          if (Ext.getCmp('tag_list')){
-            Ext.getCmp('tag_list').setValue(record.get('tag_list'));
-          }
-          if (Ext.getCmp('content_area')){
-            Ext.getCmp('content_area').setValue(record.get('content_area'));
-          }
-          if (Ext.getCmp('position')){
-            Ext.getCmp('position').setValue(record.get('position'));
-          }
-        }
-      },
-      buttons: [{
-        text:'Submit',
-        listeners:{
-          'click':function(button){
-            var window = button.findParentByType('window');
-            var formPanel = window.query('form')[0];
-            self.initialConfig['centerRegion'].setWindowStatus('Updating article...');
-            formPanel.getForm().submit({
-              reset:false,
-              success:function(form, action){
-                self.initialConfig['centerRegion'].clearWindowStatus();
-                var obj = Ext.decode(action.response.responseText);
-                if(obj.success){
-                  self.getStore().load();
-                  if(formPanel.getForm().findField('tag_list')){
-                    var tag_list = formPanel.getForm().findField('tag_list').getValue();
-                    record.set('tag_list', tag_list);
-                  }
-                  if(formPanel.getForm().findField('content_area')){
-                    var content_area = formPanel.getForm().findField('content_area').getValue();
-                    record.set('content_area', content_area);
-                  }
-                  if(formPanel.getForm().findField('position')){
-                    var position = formPanel.getForm().findField('position').getValue();
-                    record.set('position', position);
-                  }
-                  editArticleWindow.close();
-                }
-                else{
-                  Ext.Msg.alert("Error", obj.msg);
-                }
-              },
-              failure:function(form, action){
-                self.initialConfig['centerRegion'].clearWindowStatus();
-                Ext.Msg.alert("Error", "Error updating article");
-              }
-            });
-          }
-        }
-      },{
-        text: 'Close',
-        handler: function(){
-          editArticleWindow.close();
-        }
-      }]
-    });
+		var itemId = 'editArticle-'+record.get('id');
+		var editArticleWindow = Ext.ComponentQuery.query('#'+itemId).first();
+    // var addFormItems = self.addFormItems;
+		if (self.alias.first() == 'widget.knitkit_pagearticlesgridpanel'){
+			var addFormItems = [
+				{
+			  	xtype:'textfield',
+					fieldLabel:'Content Area',
+					name:'content_area',
+					value:record.data.content_area
+			   },
+	      {
+	        xtype:'numberfield',
+	        fieldLabel:'Position',
+	        name:'position',
+					value:record.data.position
+	      }
+			]
+		} 
+		else {
+			if (self.alias.first() == 'widget.knitkit_blogarticlesgridpanel'){
+				var addFormItems = [
+					{
+		        xtype:'textfield',
+		        fieldLabel:'Tags',
+		        allowBlank:true,
+		        name:'tags',
+						value:record.data.tag_list
+		      }
+				]
+			}
+		}
+
+    if(Compass.ErpApp.Utility.isBlank(editArticleWindow)){  
+	    var editArticleWindow = Ext.create("Ext.window.Window",{
+	      layout:'fit',
+	      width:375,
+	      title:'Edit Article',
+				itemId:itemId,
+	      plain: true,
+	      buttonAlign:'center',
+	      items: {
+	        xtype: 'form',
+	        labelWidth: 110,
+	        frame:false,
+	        bodyStyle:'padding:5px 5px 0',
+	        width: 425,
+	        url:'/knitkit/erp_app/desktop/articles/update/' + self.sectionId,
+	        defaults: {
+	          width: 225
+	        },
+	        items: [
+					{
+		        xtype:'hidden',
+		        allowBlank:false,
+		        name:'id',
+		        value: record.data.id
+		      },
+	        {
+	          xtype:'textfield',
+	          fieldLabel:'Title',
+	          allowBlank:false,
+	          name:'title',
+	          value: record.data.title
+	        },
+	        {
+	          xtype:'radiogroup',
+	          fieldLabel:'Display title?',
+	          name:'display_title',
+	          columns:2,
+	          items:[
+	          {
+	            boxLabel:'Yes',
+	            name:'display_title',
+	            inputValue: 'yes',
+	            checked:record.data.display_title
+	          },
+	          {
+	            boxLabel:'No',
+	            name:'display_title',
+	            inputValue:'no',
+	            checked:!record.data.display_title
+	          }]
+	        },
+	        {
+	          xtype:'textfield',
+	          fieldLabel:'Unique Name',
+	          allowBlank:true,
+	          name:'internal_identifier',
+	          value: record.data.internal_identifier
+	        },
+	        addFormItems,
+	        {
+	          xtype: 'displayfield',
+	          fieldLabel: 'Created At',
+	          name: 'created_at',
+	          value: record.data.created_at
+	        },
+	        {
+	          xtype: 'displayfield',
+	          fieldLabel: 'Updated At',
+	          name: 'updated_at',
+	          value: record.data.updated_at
+	        }
+	        ]
+	      },
+	      buttons: [{
+	        text:'Submit',
+	        listeners:{
+	          'click':function(button){
+	            var window = button.findParentByType('window');
+	            var formPanel = window.query('form')[0];
+	            self.initialConfig['centerRegion'].setWindowStatus('Updating article...');
+	            formPanel.getForm().submit({
+	              reset:false,
+	              success:function(form, action){
+	                self.initialConfig['centerRegion'].clearWindowStatus();
+	                var obj = Ext.decode(action.response.responseText);
+	                if(obj.success){
+	                  self.getStore().load();
+	                  if(formPanel.getForm().findField('tag_list')){
+	                    var tag_list = formPanel.getForm().findField('tag_list').getValue();
+	                    record.set('tag_list', tag_list);
+	                  }
+	                  if(formPanel.getForm().findField('content_area')){
+	                    var content_area = formPanel.getForm().findField('content_area').getValue();
+	                    record.set('content_area', content_area);
+	                  }
+	                  if(formPanel.getForm().findField('position')){
+	                    var position = formPanel.getForm().findField('position').getValue();
+	                    record.set('position', position);
+	                  }
+	                  editArticleWindow.close();
+	                }
+	                else{
+	                  Ext.Msg.alert("Error", obj.msg);
+	                }
+	              },
+	              failure:function(form, action){
+	                self.initialConfig['centerRegion'].clearWindowStatus();
+	                Ext.Msg.alert("Error", "Error updating article");
+	              }
+	            });
+	          }
+	        }
+	      },{
+	        text: 'Close',
+	        handler: function(){
+	          editArticleWindow.close();
+	        }
+	      }]
+	    });
+		}
     editArticleWindow.show();
   },
 
@@ -185,39 +209,17 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.SectionArticlesGridPanel
       },
       remoteSort: true,
       fields:[
-      {
-        name:'id'
-      },
-      {
-        name:'title'
-      },
-      {
-        name:'tag_list'
-      },
-      {
-        name:'excerpt_html'
-      },
-      {
-        name:'position'
-      },
-      {
-        name:'content_area'
-      },
-      {
-        name:'body_html'
-      },
-      {
-        name:'internal_identifier'
-      },
-      {
-        name:'display_title'
-      },
-      {
-        name:'created_at'
-      },
-      {
-        name:'updated_at'
-      }
+	      {name:'id'},
+	      {name:'title'},
+	      {name:'tag_list'},
+	      {name:'excerpt_html'},
+	      {name:'position'},
+	      {name:'content_area'},
+	      {name:'body_html'},
+	      {name:'internal_identifier'},
+	      {name:'display_title'},
+	      {name:'created_at'},
+	      {name:'updated_at'}
       ]
     });
 
@@ -242,6 +244,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.SectionArticlesGridPanel
             width:40,
             items:[{
                 icon:'/images/icons/edit/edit_16x16.png',
+								iconCls:'actioncolumn_hover',
                 tooltip:'Edit',
                 handler :function(grid, rowIndex, colIndex){
                     var rec = grid.getStore().getAt(rowIndex);
@@ -266,6 +269,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.SectionArticlesGridPanel
                 width:40,
                 items:[{
                     icon:'/images/icons/edit/edit_16x16.png',
+					iconCls:'actioncolumn_hover',
                     tooltip:'Edit Attributes',
                     handler :function(grid, rowIndex, colIndex){
                         var rec = grid.getStore().getAt(rowIndex);
@@ -291,6 +295,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.SectionArticlesGridPanel
                 width:40,
                 items:[{
                     icon:'/images/icons/delete/delete_16x16.png',
+										iconCls:'actioncolumn_hover',
                     tooltip:'Delete Article from Section',
                     handler :function(grid, rowIndex, colIndex){
                         var rec = grid.getStore().getAt(rowIndex);
@@ -431,8 +436,8 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.SectionArticlesGridPanel
                     var addExistingArticleWindow = new Ext.Window({
                         layout:'fit',
                         width:375,
-                        title:'Add Existing Article',
-                        height:100,
+                        title:'Attach Existing Article',
+                        height:130,
                         plain: true,
                         buttonAlign:'center',
                         items: new Ext.FormPanel({
@@ -442,14 +447,80 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.SectionArticlesGridPanel
                             width: 425,
                             url:'/knitkit/erp_app/desktop/articles/add_existing/' + self.initialConfig['sectionId'],
                             items:[
+                            {
+                                itemId: 'available_articles_filter_combobox',
+                                xtype:'combo',
+                                hiddenName:'website_id',
+                                name:'website_id',
+                                labelWidth: 50,
+                                width:350,
+                                loadingText:'Retrieving Websites...',
+                                store:Ext.create('Ext.data.Store',{
+                                    autoLoad: true,
+                                    proxy:{
+                                        type:'ajax',
+                                        reader:{
+                                            type:'json',
+                                            root:'websites'
+                                        },
+                                        extraParams:{
+                                            section_id:self.initialConfig['sectionId']
+                                        },
+                                        url:'/knitkit/erp_app/desktop/section/available_articles_filter'
+                                    },
+                                    fields:[
+                                    {
+                                        name:'id'
+                                    },
+                                    {
+                                        name:'internal_identifier'
+
+                                    },
+                                    {
+                                        name:'name'
+
+                                    }],
+                                    listeners:{
+                                        'load':function(store){
+                                            available_articles_filter_combobox = Ext.ComponentQuery.query('#available_articles_filter_combobox')[0];
+                                            available_articles_filter_combobox.select(0);
+                                            //available_articles_filter_combobox.fireEvent('select');
+                                        },
+                                    }
+                                }),
+                                forceSelection:true,
+                                fieldLabel:'Filter By',
+                                queryMode: 'local',
+                                autoSelect:true,
+                                typeAhead: true,
+                                displayField:'name',
+                                valueField:'id',
+                                triggerAction: 'all',
+                                allowBlank:false,
+                                listeners:{
+                                    'select':function(combo, records){
+                                        available_articles_combobox = Ext.ComponentQuery.query('#available_articles_combobox')[0];
+                                        available_articles_combobox.getPicker().setLoading(false);
+                                        available_articles_combobox.getStore().load({
+                                            params:{
+                                                section_id: self.initialConfig['sectionId'],
+                                                website_id: combo.getValue()
+                                            }
+                                        });
+                                    }
+                                }
+                            },
                             {
                                 xtype:'combo',
+                                itemId:'available_articles_combobox',
                                 hiddenName:'article_id',
                                 name:'article_id',
                                 labelWidth: 50,
-                                width:200,
+                                width:350,
                                 loadingText:'Retrieving Articles...',
                                 store:Ext.create('Ext.data.Store',{
+                                    autoLoad: false,
+                                    remoteFilter: true,
                                     proxy:{
                                         type:'ajax',
                                         reader:{
@@ -468,19 +539,34 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.SectionArticlesGridPanel
                                     {
                                         name:'internal_identifier'
 
+                                    },
+                                    {
+                                        name:'combobox_display_value'
+                                    }
+                                    ],
+                                    listeners: {
+                                        'beforeload':function(store){
+                                            Ext.apply(store.getProxy().extraParams, {
+                                                website_id: Ext.ComponentQuery.query('#available_articles_filter_combobox')[0].getValue()
+                                            });
+                                        }
+                                        // ,
+                                        // 'load':function(store, records){
+                                        //     available_articles_combobox = Ext.ComponentQuery.query('#available_articles_combobox')[0];
+                                        //     available_articles_combobox.setValue(store.getAt(0).data.id);
+                                        // }                                                                                                                    
                                     }
-                                    ]
                                 }),
+                                queryMode: 'local',
                                 forceSelection:true,
-                                editable:true,
                                 fieldLabel:'Article',
                                 autoSelect:true,
                                 typeAhead: true,
-                                mode: 'remote',
-                                displayField:'internal_identifier',
+                                displayField:'combobox_display_value',
                                 valueField:'id',
                                 triggerAction: 'all',
-                                allowBlank:false
+                                allowBlank:false,
+                                loadMask: false
                             }
                             ]
                         }),
@@ -490,7 +576,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.SectionArticlesGridPanel
                                 'click':function(button){
                                     var window = button.findParentByType('window');
                                     var formPanel = window.query('form')[0];
-                                    self.initialConfig['centerRegion'].setWindowStatus('Adding article...');
+                                    self.initialConfig['centerRegion'].setWindowStatus('Attaching article...');
                                     formPanel.getForm().submit({
                                         reset:true,
                                         success:function(form, action){
@@ -498,13 +584,14 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.SectionArticlesGridPanel
                                             var obj =  Ext.decode(action.response.responseText);
                                             if(obj.success){
                                                 self.getStore().load();
+                                                window.close();
                                             }else{
-                                                Ext.Msg.alert("Error", "Error Adding article");
+                                                Ext.Msg.alert("Error", "Error Attaching article");
                                             }
                                         },
                                         failure:function(form, action){
                                             self.initialConfig['centerRegion'].clearWindowStatus();
-                                            Ext.Msg.alert("Error", "Error Adding article");
+                                            Ext.Msg.alert("Error", "Error Attaching article");
                                         }
                                     });
                                 }
@@ -577,20 +664,17 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.PageArticlesGridPanel",{
       {
         xtype:'hidden',
         allowBlank:false,
-        name:'id',
-        id: 'record_id'
+        name:'id'
       },
       {
         xtype:'textfield',
         fieldLabel:'Content Area',
-        name:'content_area',
-        id: 'content_area'
+        name:'content_area'
       },
       {
         xtype:'numberfield',
         fieldLabel:'Position',
-        name:'position',
-        id: 'position'
+        name:'position'
       }
       ]
     }, config);
@@ -615,15 +699,13 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.BlogArticlesGridPanel",{
       {
         xtype:'hidden',
         allowBlank:false,
-        name:'id',
-        id: 'record_id'
+        name:'id'
       },
       {
         xtype:'textfield',
         fieldLabel:'Tags',
         allowBlank:true,
-        name:'tags',
-        id: 'tag_list'
+        name:'tags'
       }
       ],
       columns:[{