knitkit 2.0.0 → 2.0.1

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

@@ -4,8 +4,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.InquiriesGridPanel",{
     deleteInquiry : function(rec){
         var self = this;
         Ext.getCmp('knitkitCenterRegion').setWindowStatus('Deleting inquiry...');
-        var conn = new Ext.data.Connection();
-        conn.request({
+        Ext.Ajax.request({
             url: '/knitkit/erp_app/desktop/inquiries/delete',
             method: 'POST',
             params:{

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

@@ -11,13 +11,17 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit",{
     },
 
     createWindow : function(){
+        //***********************************************************
+        //Might get rid of this or make it an option you can select
+        var title = 'KnitKit-' + currentUser.description
+        //***********************************************************
         var desktop = this.app.getDesktop();
         var win = desktop.getWindow('knitkit');
         this.centerRegion = new Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion();
         if(!win){
             win = desktop.createWindow({
                 id: 'knitkit',
-                title:'KnitKit',
+                title:title,
                 autoDestroy:true,
                 width:1200,
                 height:550,

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

@@ -20,8 +20,8 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.PublishWindow",{
       "publish_failure"
       );
 
-    Compass.ErpApp.Desktop.Applications.Knitkit.PublishWindow.superclass.initComponent.call(this, arguments);
-  },
+        this.callParent(arguments);
+    },
 
   constructor : function(config) {
     config = Ext.apply({

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

@@ -8,9 +8,9 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.PublishedGridPanel",{
 
   activate : function(rec){
     var self = this;
-    var conn = new Ext.data.Connection();
-    conn.request({
+    Ext.Ajax.request({
       url: '/knitkit/erp_app/desktop/site/activate_publication',
+      timeout: 90000,
       method: 'POST',
       params:{
         id:self.initialConfig.siteId,
@@ -18,11 +18,17 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.PublishedGridPanel",{
       },
       success: function(response) {
         var obj =  Ext.decode(response.responseText);
+        var msg = "";
+                if (obj.msg){
+                    msg = obj.msg;
+                }else{
+                    msg = 'Error activating publication';
+                }
         if(obj.success){
           self.getStore().load();
         }
         else{
-          Ext.Msg.alert('Error', 'Error activating publication');
+          Ext.Msg.alert('Error', msg);
         }
       },
       failure: function(response) {
@@ -33,8 +39,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.PublishedGridPanel",{
 
   setViewingVersion : function(rec){
     var self = this;
-    var conn = new Ext.data.Connection();
-    conn.request({
+    Ext.Ajax.request({
       url: '/knitkit/erp_app/desktop/site/set_viewing_version',
       method: 'POST',
       params:{
@@ -111,19 +116,19 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.PublishedGridPanel",{
       {
         header: "Version",
         sortable:true,
-        width: 60,
+        width: 45,
         dataIndex: 'version'
       },
       {
         header: "Published",
-        width: 130,
+        width: 117,
         sortable:true,
         renderer: Ext.util.Format.dateRenderer('m/d/Y H:i:s'),
         dataIndex: 'created_at'
       },
       {
         header: "Published By",
-        width: 130,
+        width: 72,
         sortable:true,
         dataIndex: 'published_by_username'
       },
@@ -133,7 +138,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.PublishedGridPanel",{
         xtype:'actioncolumn',
         header:'Viewing',
         align:'center',
-        width:50,
+        width:46,
         items:[{
           getClass: function(v, meta, rec) {  // Or return a class from a function
             if (rec.get('viewing')) {
@@ -161,7 +166,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.PublishedGridPanel",{
         xtype:'actioncolumn',
         header:'Active',
         align:'center',
-        width:50,
+        width:44,
         items:[{
           getClass: function(v, meta, rec) {  // Or return a class from a function
             if (rec.get('active')) {
@@ -173,7 +178,11 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.PublishedGridPanel",{
             }
           },
           handler: function(grid, rowIndex, colIndex) {
-            if(currentUser.hasRole(['admin','publisher'])){
+             if (currentUser.hasApplicationCapability('knitkit', {
+                            capability_type_iid:'activate',
+                            resource:'Website'
+                        }))
+              {
               var rec = grid.getStore().getAt(rowIndex);
               if(rec.get('active')){
                 return false;

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

@@ -1,15 +1,15 @@
 Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.SectionArticlesGridPanel",{
   extend:"Ext.grid.Panel",
   alias:'widget.knitkit_sectionarticlesgridpanel',
-  deleteArticle : function(id){
+  detachArticle : function(article_id){
     var self = this;
-    this.initialConfig['centerRegion'].setWindowStatus('Deleting...');
-    var conn = new Ext.data.Connection();
-    conn.request({
-      url: '/knitkit/erp_app/desktop/articles/delete',
+    this.initialConfig['centerRegion'].setWindowStatus('Detaching...');
+    Ext.Ajax.request({
+      url: '/knitkit/erp_app/desktop/section/detach_article',
       method: 'POST',
       params:{
-        id:id
+        id:self.initialConfig['sectionId'],
+        article_id:article_id
       },
       success: function(response) {
         var obj =  Ext.decode(response.responseText);
@@ -18,13 +18,13 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.SectionArticlesGridPanel
           self.getStore().load();
         }
         else{
-          Ext.Msg.alert('Error', 'Error deleting Article');
+          Ext.Msg.alert('Error', 'Error detaching Article');
           self.initialConfig['centerRegion'].clearWindowStatus();
         }
       },
       failure: function(response) {
         self.initialConfig['centerRegion'].clearWindowStatus();
-        Ext.Msg.alert('Error', 'Error deleting Article');
+        Ext.Msg.alert('Error', 'Error detaching Article');
       }
     });
   },
@@ -69,7 +69,6 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.SectionArticlesGridPanel
             inputValue: 'yes',
             checked:record.get('display_title')
           },
-
           {
             boxLabel:'No',
             name:'display_title',
@@ -84,7 +83,19 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.SectionArticlesGridPanel
           name:'internal_identifier',
           value: record.get('internal_identifier')
         },
-        addFormItems
+        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:{
@@ -163,6 +174,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.SectionArticlesGridPanel
 
     // create the Data Store
     var store = Ext.create('Ext.data.Store', {
+      pageSize: 10,
       proxy: {
         type: 'ajax',
         url:'/knitkit/erp_app/desktop/articles/get/' + sectionId,
@@ -199,6 +211,12 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.SectionArticlesGridPanel
       },
       {
         name:'display_title'
+      },
+      {
+        name:'created_at'
+      },
+      {
+        name:'updated_at'
       }
       ]
     });
@@ -208,76 +226,88 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.SectionArticlesGridPanel
       sortable:true,
       dataIndex:'title',
       width:110
-    },{
-      header:'Unique Name',
-      sortable:true,
-      dataIndex:'internal_identifier',
-      width:110,
-      editable:false
     }];
 
     if(!Compass.ErpApp.Utility.isBlank(config['columns'])){
       overiddenColumns = overiddenColumns.concat(config['columns']);
     }
 
-    overiddenColumns = overiddenColumns.concat([
-    {
-        menuDisabled:true,
-        resizable:false,
-        xtype:'actioncolumn',
-        header:'HTML',
-        align:'center',
-        width:40,
-        items:[{
-          icon:'/images/icons/edit/edit_16x16.png',
-          tooltip:'Edit',
-          handler :function(grid, rowIndex, colIndex){
-            var rec = grid.getStore().getAt(rowIndex);
-            self.initialConfig['centerRegion'].editContent(rec.get('title'), rec.get('id'), rec.get('body_html'), grid.ownerCt.initialConfig.siteId, grid.ownerCt.initialConfig.contentType, grid.getStore());
-          }
-        }]
-      },
-      {
-        menuDisabled:true,
-        resizable:false,
-        xtype:'actioncolumn',
-        header:'Edit',
-        align:'center',
-        width:40,
-        items:[{
-          icon:'/images/icons/edit/edit_16x16.png',
-          tooltip:'Edit',
-          handler :function(grid, rowIndex, colIndex){
-            var rec = grid.getStore().getAt(rowIndex);
-            self.editArticle(rec);
-          }
-        }]
-      },
-      {
-        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.deleteArticle(id);
+       overiddenColumns = overiddenColumns.concat([
+        {
+            menuDisabled:true,
+            resizable:false,
+            xtype:'actioncolumn',
+            header:'HTML',
+            align:'center',
+            width:40,
+            items:[{
+                icon:'/images/icons/edit/edit_16x16.png',
+                tooltip:'Edit',
+                handler :function(grid, rowIndex, colIndex){
+                    var rec = grid.getStore().getAt(rowIndex);
+                    self.initialConfig['centerRegion'].editContent(rec.get('title'), rec.get('id'), rec.get('body_html'), grid.ownerCt.initialConfig.siteId, grid.ownerCt.initialConfig.contentType, grid.getStore());
                 }
-              }
-              );
-          }
-        }]
-      }
-      ]);
+            }]
+        }]);
+        
+        if (currentUser.hasApplicationCapability('knitkit', {
+            capability_type_iid:'edit',
+            resource:'Article'
+        }))
+
+        {
+            overiddenColumns = overiddenColumns.concat([
+            {
+                menuDisabled:true,
+                resizable:false,
+                xtype:'actioncolumn',
+                header:'Edit',
+                align:'center',
+                width:40,
+                items:[{
+                    icon:'/images/icons/edit/edit_16x16.png',
+                    tooltip:'Edit Attributes',
+                    handler :function(grid, rowIndex, colIndex){
+                        var rec = grid.getStore().getAt(rowIndex);
+                        self.editArticle(rec);
+                    }
+                }]
+            }]);
+        }
+
+        if (currentUser.hasApplicationCapability('knitkit', {
+            capability_type_iid:'delete',
+            resource:'Article'
+        }))
+
+        {
+            overiddenColumns = overiddenColumns.concat([
+            {
+                menuDisabled:true,
+                resizable:false,
+                xtype:'actioncolumn',
+                header:'Detach',
+                align:'center',
+                width:40,
+                items:[{
+                    icon:'/images/icons/delete/delete_16x16.png',
+                    tooltip:'Delete Article from Section',
+                    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? NOTE: Article may be orphaned',
+                            function(btn){
+                                if (btn == 'yes'){
+                                    self.detachArticle(id);
+                                }
+                            }
+                            );
+                    }
+                }]
+            }
+            ]);
+        }
 
     var addFormItems = [
     {
@@ -316,166 +346,187 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.SectionArticlesGridPanel
     if(!Compass.ErpApp.Utility.isBlank(config['addFormItems'])){
       addFormItems = addFormItems.concat(config['addFormItems']);
     }
-        
-    config['columns'] = overiddenColumns;
-    config = Ext.apply({
-      store:store,
-      tbar: [{
-        text: 'Add New Article',
-        iconCls: 'icon-add',
-        handler : function(){
-          var addArticleWindow = new Ext.Window({
-            layout:'fit',
-            width:375,
-            title:'New Article',
-            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/' + self.initialConfig['sectionId'],
-              defaults: {
-                width: 225
-              },
-              items: addFormItems
-            }),
-            buttons: [{
-              text:'Submit',
-              listeners:{
-                'click':function(button){
-                  var window = button.findParentByType('window');
-                  var formPanel = window.query('form')[0];
-                  self.initialConfig['centerRegion'].setWindowStatus('Creating article...');
-                  formPanel.getForm().submit({
-                    reset:true,
-                    success:function(form, action){
-                      self.initialConfig['centerRegion'].clearWindowStatus();
-                      var obj =  Ext.decode(action.response.responseText);
-                      if(obj.success){
-                        self.getStore().load();
-                      }
-                      else{
-                        Ext.Msg.alert("Error", obj.msg);
-                      }
-                      addArticleWindow.close();
-                                            
-                    },
-                    failure:function(form, action){
-                      self.initialConfig['centerRegion'].clearWindowStatus();
-                      Ext.Msg.alert("Error", "Error creating article");
-                    }
-                  });
+    
+        var tbarItems = [];
+
+        if (currentUser.hasApplicationCapability('knitkit', {
+            capability_type_iid:'create',
+            resource:'Article'
+        }))
+
+        {
+            tbarItems.push(
+            {
+                text: 'New Article',
+                iconCls: 'icon-add',
+                handler : function(){
+                    var addArticleWindow = new Ext.Window({
+                        layout:'fit',
+                        width:375,
+                        title:'New Article',
+                        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/' + self.initialConfig['sectionId'],
+                            defaults: {
+                                width: 257
+                            },
+                            items: addFormItems
+                        }),
+                        buttons: [{
+                            text:'Submit',
+                            listeners:{
+                                'click':function(button){
+                                    var window = button.findParentByType('window');
+                                    var formPanel = window.query('form')[0];
+                                    self.initialConfig['centerRegion'].setWindowStatus('Creating article...');
+                                    formPanel.getForm().submit({
+                                        reset:true,
+                                        success:function(form, action){
+                                            self.initialConfig['centerRegion'].clearWindowStatus();
+                                            var obj =  Ext.decode(action.response.responseText);
+                                            if(obj.success){
+                                                self.getStore().load();
+                                            }
+                                            else{
+                                                Ext.Msg.alert("Error", obj.msg);
+                                            }
+                                            addArticleWindow.close();
+
+                                        },
+                                        failure:function(form, action){
+                                            self.initialConfig['centerRegion'].clearWindowStatus();
+                                            Ext.Msg.alert("Error", "Error creating article");
+                                        }
+                                    });
+                                }
+                            }
+                        },{
+                            text: 'Close',
+                            handler: function(){
+                                addArticleWindow.close();
+                            }
+                        }]
+                    });
+                    addArticleWindow.show();
                 }
-              }
-            },{
-              text: 'Close',
-              handler: function(){
-                addArticleWindow.close();
-              }
-            }]
-          });
-          addArticleWindow.show();
+            });
         }
-      },
-      {
-        text: 'Add Existing Article',
-        iconCls: 'icon-copy',
-        handler : function(){
-          var addExistingArticleWindow = new Ext.Window({
-            layout:'fit',
-            width:375,
-            title:'Add Existing Article',
-            height:100,
-            plain: true,
-            buttonAlign:'center',
-            items: new Ext.FormPanel({
-              labelWidth: 75,
-              frame:false,
-              bodyStyle:'padding:5px 5px 0',
-              width: 425,
-              url:'/knitkit/erp_app/desktop/articles/add_existing/' + self.initialConfig['sectionId'],
-              items:[
-              {
-                xtype:'combo',
-                hiddenName:'article_id',
-                name:'article_id',
-                labelWidth: 50,
-                width:200,
-                loadingText:'Retrieving Articles...',
-                store:Ext.create('Ext.data.Store',{
-                  proxy:{
-                    type:'ajax',
-                    reader:{
-                      type:'json',
-                      root:'articles'
-                    },
-                    extraParams:{
-                      section_id:self.initialConfig['sectionId']
-                    },
-                    url:'/knitkit/erp_app/desktop/section/available_articles'
-                  },
-                  fields:[
-                  {
-                    name:'id'
-                  },
-                  {
-                    name:'internal_identifier'
 
-                  }
-                  ]
-                }),
-                forceSelection:true,
-                editable:true,
-                fieldLabel:'Article',
-                autoSelect:true,
-                typeAhead: true,
-                mode: 'remote',
-                displayField:'internal_identifier',
-                valueField:'id',
-                triggerAction: 'all',
-                allowBlank:false
-              }
-              ]
-            }),
-            buttons: [{
-              text:'Submit',
-              listeners:{
-                'click':function(button){
-                  var window = button.findParentByType('window');
-                  var formPanel = window.query('form')[0];
-                  self.initialConfig['centerRegion'].setWindowStatus('Adding article...');
-                  formPanel.getForm().submit({
-                    reset:true,
-                    success:function(form, action){
-                      self.initialConfig['centerRegion'].clearWindowStatus();
-                      var obj =  Ext.decode(action.response.responseText);
-                      if(obj.success){
-                        self.getStore().load();
-                      }else{
-                        Ext.Msg.alert("Error", "Error Adding article");
-                      }
-                    },
-                    failure:function(form, action){
-                      self.initialConfig['centerRegion'].clearWindowStatus();
-                      Ext.Msg.alert("Error", "Error Adding article");
-                    }
-                  });
+        if (currentUser.hasApplicationCapability('knitkit', {
+            capability_type_iid:'add_existing',
+            resource:'Article'
+        }))
+
+        {
+            tbarItems.push(
+            {
+                text: 'Attach Article',
+                iconCls: 'icon-copy',
+                handler : function(){
+                    var addExistingArticleWindow = new Ext.Window({
+                        layout:'fit',
+                        width:375,
+                        title:'Add Existing Article',
+                        height:100,
+                        plain: true,
+                        buttonAlign:'center',
+                        items: new Ext.FormPanel({
+                            labelWidth: 75,
+                            frame:false,
+                            bodyStyle:'padding:5px 5px 0',
+                            width: 425,
+                            url:'/knitkit/erp_app/desktop/articles/add_existing/' + self.initialConfig['sectionId'],
+                            items:[
+                            {
+                                xtype:'combo',
+                                hiddenName:'article_id',
+                                name:'article_id',
+                                labelWidth: 50,
+                                width:200,
+                                loadingText:'Retrieving Articles...',
+                                store:Ext.create('Ext.data.Store',{
+                                    proxy:{
+                                        type:'ajax',
+                                        reader:{
+                                            type:'json',
+                                            root:'articles'
+                                        },
+                                        extraParams:{
+                                            section_id:self.initialConfig['sectionId']
+                                        },
+                                        url:'/knitkit/erp_app/desktop/section/available_articles'
+                                    },
+                                    fields:[
+                                    {
+                                        name:'id'
+                                    },
+                                    {
+                                        name:'internal_identifier'
+
+                                    }
+                                    ]
+                                }),
+                                forceSelection:true,
+                                editable:true,
+                                fieldLabel:'Article',
+                                autoSelect:true,
+                                typeAhead: true,
+                                mode: 'remote',
+                                displayField:'internal_identifier',
+                                valueField:'id',
+                                triggerAction: 'all',
+                                allowBlank:false
+                            }
+                            ]
+                        }),
+                        buttons: [{
+                            text:'Submit',
+                            listeners:{
+                                'click':function(button){
+                                    var window = button.findParentByType('window');
+                                    var formPanel = window.query('form')[0];
+                                    self.initialConfig['centerRegion'].setWindowStatus('Adding article...');
+                                    formPanel.getForm().submit({
+                                        reset:true,
+                                        success:function(form, action){
+                                            self.initialConfig['centerRegion'].clearWindowStatus();
+                                            var obj =  Ext.decode(action.response.responseText);
+                                            if(obj.success){
+                                                self.getStore().load();
+                                            }else{
+                                                Ext.Msg.alert("Error", "Error Adding article");
+                                            }
+                                        },
+                                        failure:function(form, action){
+                                            self.initialConfig['centerRegion'].clearWindowStatus();
+                                            Ext.Msg.alert("Error", "Error Adding article");
+                                        }
+                                    });
+                                }
+                            }
+                        },{
+                            text: 'Close',
+                            handler: function(){
+                                addExistingArticleWindow.close();
+                            }
+                        }]
+                    });
+                    addExistingArticleWindow.show();
                 }
-              }
-            },{
-              text: 'Close',
-              handler: function(){
-                addExistingArticleWindow.close();
-              }
-            }]
-          });
-          addExistingArticleWindow.show();
+            }
+            );
         }
-      }],
+    
+    config['columns'] = overiddenColumns;
+    config = Ext.apply({
+      store:store,
+      tbar: tbarItems,
       bbar: new Ext.PagingToolbar({
-        pageSize: 10,
         store: store,
         displayInfo: true,
         displayMsg: '{0} - {1} of {2}',
@@ -599,7 +650,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.BlogArticlesGridPanel",{
         width:50,
         items:[{
           icon:'/images/icons/edit/edit_16x16.png',
-          tooltip:'Edit',
+          tooltip:'Edit Excerpt',
           handler :function(grid, rowIndex, colIndex){
             var rec = grid.getStore().getAt(rowIndex);
             self.initialConfig['centerRegion'].editExcerpt(rec.get('title') + ' - Excerpt', rec.get('id'), rec.get('excerpt_html'), self.initialConfig.siteId, grid.getStore());