knitkit 2.0.5 → 2.0.6

data/lib/knitkit/version.rb

@@ -2,7 +2,7 @@ module Knitkit
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 0
-    TINY  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

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

@@ -7,9 +7,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ArticlesGridPanel",{
     Ext.Ajax.request({
       url: '/knitkit/erp_app/desktop/articles/delete',
       method: 'POST',
-      params:{
-        id:id
-      },
+      params:{id:id},
       success: function(response) {
         var obj = Ext.decode(response.responseText);
         if(obj.success){
@@ -28,363 +26,131 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ArticlesGridPanel",{
     });
   },
 
-// shouldnt need this anymore
-    deleteAttribute : function(id){
-        var self = this;
-        this.initialConfig['centerRegion'].setWindowStatus('Deleting...');
-        var conn = new Ext.data.Connection();
-        conn.request({
-            url: '/knitkit/erp_app/desktop/articles/delete_attribute',
-            method: 'POST',
-            params:{
-                id:id
-            },
-            success: function(response) {
-                var obj = Ext.decode(response.responseText);
-                if(obj.success){
-                    self.initialConfig['centerRegion'].clearWindowStatus();
-                    Ext.getCmp('editGlobalArticleAttributesWindowGrid').getStore().load();
-                }
-                else{
-                    Ext.Msg.alert('Error', 'Error deleting Article');
-                    self.initialConfig['centerRegion'].clearWindowStatus();
-                }
-            },
-            failure: function(response) {
-                self.initialConfig['centerRegion'].clearWindowStatus();
-                Ext.Msg.alert('Error', 'Error deleting Article');
-            }
-        });
-    },
-
-// shouldnt need this
-    editAttributes :function(record) {
-        var self = this;
-
-        var attributesStore = Ext.create('Ext.data.Store', {
-            proxy: {
-                type: 'ajax',
-                url:'/knitkit/erp_app/desktop/articles/article_attributes/',
-                extraParams:{
-                    article_id:record.get('id')
-                },
-                reader: {
-                    type: 'json',
-                    root: 'data'
-                }
-            },
-            remoteSort: true,
-            fields:[
-            {
-                name:'id'
-            },
-            {
-                name:'description'
-            },
-            {
-                name:'data_type'
-            },
-            {
-                name:'value'
-            }
-            ]
-        });
-
-        var editArticleAttributesWindow = Ext.create("Ext.window.Window",{
-            layout:'fit',
-            width:375,
-            height:253,
-            title:'Edit Attributes',
-            plain: true,
-            buttonAlign:'center',
-            items: {
-                xtype: 'grid',
-                id: 'editGlobalArticleAttributesWindowGrid',
-                border:false,
-                frame:false,
-                store: attributesStore,
-                columns: [
-                {
-                    header: "id",
-                    width: 30,
-                    dataIndex: 'id',
-                    sortable: true,
-                    hidden:true
-                },
-                {
-                    id: 'description',
-                    header: "Name",
-                    width: 151,
-                    dataIndex: 'description',
-                    sortable: true
-                },
-                {
-                    id: 'data_type',
-                    header: "Data_Type",
-                    width: 70,
-                    dataIndex: 'data_type',
-                    sortable: true
-                },
-                {
-                    id: 'value',
-                    header: "Value",
-                    width: 100,
-                    dataIndex: 'value',
-                    sortable: true
-                },
-                {
-                    menuDisabled:true,
-                    resizable:false,
-                    xtype:'actioncolumn',
-                    header:'Delete',
-                    align:'center',
-                    width:40,
-                    items:[{
-                        icon:'/images/icons/delete/delete_16x16.png',
-                        tooltip:'Delete',
-                        handler :function(grid, rowIndex, colIndex){
-                            var rec = grid.getStore().getAt(rowIndex);
-                            var id = rec.get('id');
-                            var messageBox = Ext.MessageBox.confirm(
-                                'Confirm', 'Are you sure?',
-                                function(btn){
-                                    if (btn == 'yes'){
-                                        self.deleteAttribute(id);
-                                    }
-                                }
-                                );
-                        }
-                    }]
-                }],
-                tbar: [{
-                    text: 'Add Attribute',
-                    iconCls: 'icon-add',
-                    handler : function(){
-                        var addAttributeWindow = new Ext.Window({
-                            layout:'fit',
-                            width:375,
-                            title:'New Attribute',
-                            plain: true,
-                            buttonAlign:'center',
-                            items: new Ext.FormPanel({
-                                labelWidth: 110,
-                                frame:false,
-                                bodyStyle:'padding:5px 5px 0',
-                                width: 425,
-                                url:'/knitkit/erp_app/desktop/articles/new_attribute/',
-                                defaults: {
-                                    width: 257
-                                },
-                                items:[
-                                {
-                                    xtype:'hidden',
-                                    name:'article_id',
-                                    value:record.get('id')
-                                },
-                                {
-                                    xtype:'textfield',
-                                    fieldLabel:'Name',
-                                    allowBlank:false,
-                                    name:'description'
-                                },
-                                {
-                                    xtype:'combo',
-                                    fieldLabel:'Data_type',
-                                    forceSelection:true,
-                                    store:[
-                                    ['Text','Text'],
-                                    ['Date', 'Date'],
-                                    ['Boolean', 'Boolean'],
-                                    ['Integer', 'Integer'],
-                                    ['Float', 'Float']
-                                    ],
-                                    value:'Text',
-                                    name:'data_type',
-                                    allowBlank: false,
-                                    triggerAction:'all'
-                                },
-                                {
-                                    xtype:'textfield',
-                                    fieldLabel:'Value',
-                                    allowBlank:false,
-                                    name:'value'
-                                }]
-                            }),
-                            buttons: [{
-                                text:'Submit',
-                                listeners:{
-                                    'click':function(button){
-                                        var window = button.findParentByType('window');
-                                        var formPanel = window.query('form')[0];
-                                        self.initialConfig['centerRegion'].setWindowStatus('Creating attribute...');
-                                        formPanel.getForm().submit({
-                                            reset:true,
-                                            success:function(form, action){
-                                                self.initialConfig['centerRegion'].clearWindowStatus();
-                                                var obj =  Ext.decode(action.response.responseText);
-                                                if(obj.success){
-                                                    Ext.getCmp('editGlobalArticleAttributesWindowGrid').getStore().load()
-                                                }
-                                                else{
-                                                    Ext.Msg.alert("Error", obj.msg);
-                                                }
-                                                addAttributeWindow.close();
-
-                                            },
-                                            failure:function(form, action){
-                                                self.initialConfig['centerRegion'].clearWindowStatus();
-                                                Ext.Msg.alert("Error", "Error creating attribute");
-                                            }
-                                        });
-                                    }
-                                }
-                            },{
-                                text: 'Close',
-                                handler: function(){
-                                    addAttributeWindow.close();
-                                }
-                            }]
-                        });
-                        addAttributeWindow.show();
-                    }
-                }],
-                bbar: new Ext.PagingToolbar({
-                    pageSize: 5,
-                    store: attributesStore,
-                    displayInfo: true,
-                    displayMsg: '{0} - {1} of {2}',
-                    emptyMsg: "Empty"
-                }),
-                renderTo: Ext.getBody(),
-                autoscroll: true,
-                loadMask: true
-            }
-        });
-        attributesStore.loadPage(1);
-        editArticleAttributesWindow.show();
-    },
-
   editArticle : function(record){
     var self = this;
-
-    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/',
-        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:[
+    var itemId = 'editArticle-'+record.get('id');
+    var editArticleWindow = Ext.ComponentQuery.query('#'+itemId).first();
+
+    if(Compass.ErpApp.Utility.isBlank(editArticleWindow)){
+      var editArticleWindow = Ext.create("Ext.window.Window",{
+        layout:'fit',
+        width:375,
+        title:'Edit Article',
+        itemId:itemId,
+        // minimizable:true,
+        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/',
+          defaults: {width: 225},
+          items: [
           {
-            boxLabel:'Yes',
-            name:'display_title',
-            inputValue: 'yes',
-            checked:record.get('display_title')
+            xtype:'textfield',
+            fieldLabel:'Title',
+            allowBlank:false,
+            name:'title',
+            value: record.data.title
           },
-
           {
-            boxLabel:'No',
+            xtype:'radiogroup',
+            fieldLabel:'Display title?',
             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')
-        },
-        {
-          xtype:'textfield',
-          fieldLabel:'Tags',
-          allowBlank:true,
-          name:'tags',
-          id: 'tag_list',
-          value: record.get('tag_list')
-        },
-        {
-          xtype: 'displayfield',
-          fieldLabel: 'Created At',
-          name: 'created_at',
-          value: record.data.created_at
+            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
+          },
+          {
+            xtype:'textfield',
+            fieldLabel:'Tags',
+            allowBlank:true,
+            name:'tags',
+            itemId: 'tag_list',
+            value: record.data.tag_list
+          },
+          {
+            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
+          },        
+          {
+            xtype:'hidden',
+            allowBlank:false,
+            name:'id',
+            itemId: 'record_id',
+            value: record.data.id
+          }
+          ]
         },
-        {
-          xtype: 'displayfield',
-          fieldLabel: 'Updated At',
-          name: 'updated_at',
-          value: record.data.updated_at
-        },        
-        {
-          xtype:'hidden',
-          allowBlank:false,
-          name:'id',
-          id: 'record_id',
-          value: record.get('id')
-        }
-        ]
-      },
-      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);
+        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);
+                    }
+                    editArticleWindow.close();
                   }
-                  editArticleWindow.close();
-                }
-                else{
-                  Ext.Msg.alert("Error", obj.msg);
+                  else{
+                    Ext.Msg.alert("Error", obj.msg);
+                  }
+                },
+                failure:function(form, action){
+                  self.initialConfig['centerRegion'].clearWindowStatus();
+                  Ext.Msg.alert("Error", "Error updating article");
                 }
-              },
-              failure:function(form, action){
-                self.initialConfig['centerRegion'].clearWindowStatus();
-                Ext.Msg.alert("Error", "Error updating article");
-              }
-            });
+              });
+            }
           }
-        }
-      },{
-        text: 'Close',
-        handler: function(){
-          editArticleWindow.close();
-        }
-      }]
-    });
+        },{
+          text: 'Close',
+          handler: function(){
+            editArticleWindow.close();
+          }
+        }]
+      });
+    }
     editArticleWindow.show();
   },
 
@@ -402,43 +168,20 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ArticlesGridPanel",{
       proxy: {
         type: 'ajax',
         url:'/knitkit/erp_app/desktop/articles/all/',
-        reader: {
-          type: 'json',
-          root: 'data'
-        }
+        reader: {type: 'json', root: 'data'}
       },
       remoteSort: true,
       fields:[
-      {
-        name:'id'
-      },
-      {
-        name:'title'
-      },
-      {
-        name:'tag_list'
-      },
-      {
-        name:'excerpt_html'
-      },
-      {
-        name:'body_html'
-      },
-      {
-        name:'sections'
-      },
-      {
-        name:'internal_identifier'
-      },
-      {
-        name:'display_title'
-      },
-      {
-        name:'created_at'
-      },
-      {
-        name:'updated_at'
-      }
+        {name:'id'},
+        {name:'title'},
+        {name:'tag_list'},
+        {name:'excerpt_html'},
+        {name:'body_html'},
+        {name:'sections'},
+        {name:'internal_identifier'},
+        {name:'display_title'},
+        {name:'created_at'},
+        {name:'updated_at'}
       ]
     });
 
@@ -460,6 +203,7 @@ var columnItems = [];
             align:'center',
             width:50,
             items:[{
+                iconCls:'actioncolumn_hover',
                 getClass: function(v, meta, rec) {  // Or return a class from a function
                     this.items[0].tooltip = rec.get('sections');
                     return 'info-col';
@@ -486,6 +230,7 @@ var columnItems = [];
                 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);
@@ -505,6 +250,7 @@ var columnItems = [];
             width:60,
             items:[{
                 icon:'/images/icons/document_text/document_text_16x16.png',
+                iconCls:'actioncolumn_hover',
                 tooltip:'Comments',
                 handler :function(grid, rowIndex, colIndex){
                     var rec = grid.getStore().getAt(rowIndex);
@@ -529,6 +275,7 @@ var columnItems = [];
                 width:50,
                 items:[{
                     icon:'/images/icons/edit/edit_16x16.png',
+                    iconCls:'actioncolumn_hover',
                     tooltip:'Edit Excerpt',
                     handler :function(grid, rowIndex, colIndex){
                         var rec = grid.getStore().getAt(rowIndex);
@@ -548,6 +295,7 @@ var columnItems = [];
             width:40,
             items:[{
                 icon:'/images/icons/edit/edit_16x16.png',
+                iconCls:'actioncolumn_hover',
                 tooltip:'Edit Content',
                 handler :function(grid, rowIndex, colIndex){
                     var rec = grid.getStore().getAt(rowIndex);
@@ -572,6 +320,7 @@ var columnItems = [];
                 width:40,
                 items:[{
                     icon:'/images/icons/delete/delete_16x16.png',
+                    iconCls:'actioncolumn_hover',
                     tooltip:'Delete',
                     handler :function(grid, rowIndex, colIndex){
                         var rec = grid.getStore().getAt(rowIndex);
@@ -615,9 +364,7 @@ var columnItems = [];
                             bodyStyle:'padding:5px 5px 0',
                             width: 425,
                             url:'/knitkit/erp_app/desktop/articles/new/',
-                            defaults: {
-                                width: 257
-                            },
+                            defaults: {width: 257},
                             items:[
                             {
                                 xtype:'textfield',
@@ -654,8 +401,8 @@ var columnItems = [];
                                 xtype:'textfield',
                                 fieldLabel:'Tags',
                                 allowBlank:true,
-                                name:'tags',
-                                id: 'tag_list'
+                                name:'tags'
+                                // id: 'tag_list'
                             }]
                         }),
                         buttons: [{
@@ -710,7 +457,7 @@ var columnItems = [];
             iconCls: 'icon-search',
             handler: function(button) {
                 var iid = Ext.getCmp('global_article_search_field').getValue();
-                store.setProxy({
+                store.setProxy({ 
                     type: 'ajax',
                     url: '/knitkit/erp_app/desktop/articles/all/',
                     reader: {
@@ -719,9 +466,7 @@ var columnItems = [];
                         idProperty: 'id',
                         totalProperty:'total'
                     },
-                    extraParams:{
-                        iid:iid,
-                    }
+                    extraParams:{iid:iid}
                 });
                 store.load();
             }
@@ -741,9 +486,7 @@ var columnItems = [];
                         frame:false,
                         bodyStyle:'padding:5px 5px 0',
                         width: 425,
-                        defaults: {
-                            width: 257
-                        },
+                        defaults: {width: 257},
                         items:[
                         {
                             xtype:'textfield',
@@ -752,6 +495,13 @@ var columnItems = [];
                             name:'title',
                             id:'global_article_advanced_search_title'
                         },
+                        {
+                            xtype:'textfield',
+                            fieldLabel:'Content',
+                            allowBlank:true,
+                            name:'content',
+                            id:'global_article_advanced_search_content'
+                        },
                         {
                             xtype:'fieldset',
                             border: false,
@@ -874,7 +624,8 @@ var columnItems = [];
                         text:'Submit',
                         listeners:{
                             'click':function(button){
-                                var iid = Ext.getCmp('global_article_advanced_search_title').getValue();
+                                var title = Ext.getCmp('global_article_advanced_search_title').getValue();
+                                var content = Ext.getCmp('global_article_advanced_search_content').getValue();
                                 var created_start_date = Ext.getCmp('global_article_advanced_search_created_start_date').getValue();
                                 var created_end_date = Ext.getCmp('global_article_advanced_search_created_end_date').getValue();
                                 var updated_start_date = Ext.getCmp('global_article_advanced_search_updated_start_date').getValue();
@@ -894,7 +645,8 @@ var columnItems = [];
                                         totalProperty:'total'
                                     },
                                     extraParams:{
-                                        iid:iid,
+                                        title:title,
+                                        content:content,
                                         created_start_date:created_start_date,
                                         created_end_date:created_end_date,
                                         updated_start_date:updated_start_date,
@@ -942,5 +694,3 @@ var columnItems = [];
     this.callParent([config]);
   }
 });
-
-