knitkit 3.0.0 → 3.2.0

data/{public → app/assets}/javascripts/erp_app/desktop/applications/knitkit/versions_grid_panel.js

@@ -57,7 +57,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.VersionsGridPanel", {
                 flex: 0.5,
                 items: [
                     {
-                        icon: '/images/icons/eye/eye_16x16.png',
+                        icon: '/assets/icons/eye/eye_16x16.png',
                         tooltip: 'View',
                         getClass: function (v, meta, rec) {
                             return 'x-action-col-icon';
@@ -68,7 +68,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.VersionsGridPanel", {
                         }
                     },
                     {
-                        icon: '/images/icons/document_down/document_down_16x16.png',
+                        icon: '/assets/icons/document_down/document_down_16x16.png',
                         tooltip: 'Revert',
                         getClass: function (v, meta, rec) {
                             return 'x-action-col-icon';
@@ -374,30 +374,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.VersionsBlogGridPanel",
                         name: 'publisher'
                     }
                 ]
-            }),
-            columns: [
-                {
-                    menuDisabled: true,
-                    resizable: false,
-                    xtype: 'actioncolumn',
-                    header: 'Action',
-                    align: 'center',
-                    width: 50,
-                    items: [
-                        {
-                            icon: '/images/icons/document_view/document_view_16x16.png',
-                            tooltip: 'View',
-                            getClass: function (v, meta, rec) {
-                                return 'x-action-col-icon';
-                            },
-                            handler: function (grid, rowIndex, colIndex) {
-                                var rec = grid.getStore().getAt(rowIndex);
-                                grid.initialConfig['centerRegion'].viewContent(rec.get('title') + " Excerpt - Revision " + rec.get('version'), rec.get('body_html'));
-                            }
-                        }
-                    ]
-                }
-            ]
+            })
         }, config);
 
         this.callParent([config]);
@@ -648,7 +625,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.NonPublishedVersionsGrid
                     flex: 0.5,
                     items: [
                         {
-                            icon: '/images/icons/document_view/document_view_16x16.png',
+                            icon: '/assets/icons/eye/eye_16x16.png',
                             tooltip: 'View',
                             getClass: function (v, meta, rec) {
                                 return 'x-action-col-icon';
@@ -659,7 +636,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.NonPublishedVersionsGrid
                             }
                         },
                         {
-                            icon: '/images/icons/document_down/document_down_16x16.png',
+                            icon: '/assets/icons/document_down/document_down_16x16.png',
                             tooltip: 'Revert',
                             getClass: function (v, meta, rec) {
                                 return 'x-action-col-icon';

data/{public → app/assets}/javascripts/erp_app/desktop/applications/knitkit/west_region/helpers/article.js

@@ -4,7 +4,7 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addArticleOptions = function (self,
         iconCls: 'icon-edit',
         listeners: {
             'click': function () {
-                var itemId = 'editArticle-' + record.get('id'),
+                var itemId = 'editArticle-' + record.get('recordId'),
                     editArticleWindow = Ext.ComponentQuery.query('#' + itemId).first();
 
                 if (Compass.ErpApp.Utility.isBlank(editArticleWindow)) {
@@ -88,7 +88,7 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addArticleOptions = function (self,
                                     allowBlank: false,
                                     name: 'id',
                                     itemId: 'record_id',
-                                    value: record.data.id
+                                    value: record.get('recordId')
                                 },
                                 {
                                     xtype: 'hidden',
@@ -114,8 +114,10 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addArticleOptions = function (self,
                                                     record.set('text', values.title);
                                                     record.set('display_title', !Ext.isEmpty(values.display_title));
                                                     record.set('content_area', values.content_area);
-                                                    if (formPanel.getForm().findField('tag_list')) {
-                                                        var tag_list = formPanel.getForm().findField('tag_list').getValue();
+                                                    record.set('internal_identifier', values.internal_identifier);
+
+                                                    if (formPanel.getForm().findField('tags')) {
+                                                        var tag_list = formPanel.getForm().findField('tags').getValue();
                                                         record.set('tag_list', tag_list);
                                                     }
                                                     window.close();
@@ -154,23 +156,35 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addArticleOptions = function (self,
                     var centerRegion = Ext.getCmp('knitkitCenterRegion'),
                         websiteId = compassDesktop.getModule('knitkit-win').currentWebsite.id;
 
-                    var url = '/knitkit/erp_app/desktop/articles/show/' + record.data.id
+                    var url = '/knitkit/erp_app/desktop/articles/show/' + record.get('recordId');
 
                     Ext.Ajax.request({
                         url: url,
                         method: 'GET',
                         extraParams: {
-                            id: record.data.id
+                            id: record.get('recordId')
                         },
                         timeout: 90000,
                         success: function (response) {
                             var article = Ext.decode(response.responseText);
-                            centerRegion.editExcerpt(article.title + ' - Excerpt', record.data.id, article.excerpt_html, websiteId);
+                            centerRegion.editExcerpt(article.title + ' - Excerpt', record.get('recordId'), article.excerpt_html, websiteId);
                         }
                     });
                 }
             }
         });
+
+        items.push({
+            text: 'View Comments',
+            iconCls: 'icon-eye',
+            listeners: {
+                'click': function () {
+                    var centerRegion = Ext.getCmp('knitkitCenterRegion');
+
+                    centerRegion.viewContentComments(record.get('recordId'), record.get('title') + ' - Comments');
+                }
+            }
+        });
     }
 
     items.push({
@@ -190,7 +204,7 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addArticleOptions = function (self,
                             method: 'POST',
                             params: {
                                 id: record.data.parentItemId,
-                                article_id: record.data.id
+                                article_id: record.get('recordId')
                             },
                             success: function (response) {
                                 var obj = Ext.decode(response.responseText);

data/{public → app/assets}/javascripts/erp_app/desktop/applications/knitkit/west_region/helpers/document.js

@@ -1,6 +1,8 @@
 Compass.ErpApp.Desktop.Applications.Knitkit.addDocumentOptions = function (self, items, record) {
-    var sectionId = record.data.id.split('_')[1];
+    var sectionId = record.get('recordId');
+    var websiteId = compassDesktop.getModule('knitkit-win').currentWebsite.id;
 
+    // Update security
     if (currentUser.hasCapability('unsecure', 'WebsiteSection') || currentUser.hasCapability('secure', 'WebsiteSection')) {
         items.push({
             text: 'Security',
@@ -8,12 +10,13 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addDocumentOptions = function (self,
             listeners: {
                 'click': function () {
                     var westRegion = Ext.getCmp('knitkitWestRegion');
-                    westRegion.changeSecurity(record, '/knitkit/erp_app/desktop/section/update_security', record.data.id.split('_')[1]);
+                    westRegion.changeSecurity(record, '/knitkit/erp_app/desktop/section/update_security', record.get('recordId'));
                 }
             }
         });
     }
 
+    // Create Document Section
     if (currentUser.hasCapability('create', 'WebsiteSection')) {
         items.push({
             text: 'Add Document',
@@ -26,11 +29,12 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addDocumentOptions = function (self,
                         title: 'New Document Section',
                         plain: true,
                         buttonAlign: 'center',
-                        items: new Ext.FormPanel({
+                        items: {
+                            xtype: 'form',
                             labelWidth: 110,
                             frame: false,
                             bodyStyle: 'padding:5px 5px 0',
-                            url: '/knitkit/erp_app/desktop/online_document_sections/new',
+                            url: '/knitkit/erp_app/desktop/online_document_sections',
                             defaults: {
                                 width: 225
                             },
@@ -59,18 +63,6 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addDocumentOptions = function (self,
                                     allowBlank: false,
                                     triggerAction: 'all'
                                 },
-                                {
-                                    xtype: 'combo',
-                                    forceSelection: true,
-                                    store: [
-                                        ['Content', 'Content']
-                                    ],
-                                    value: 'Content',
-                                    fieldLabel: 'Document Type',
-                                    name: 'documenttype',
-                                    allowBlank: false,
-                                    triggerAction: 'all'
-                                },
                                 {
                                     xtype: 'radiogroup',
                                     fieldLabel: 'Display in menu?',
@@ -94,7 +86,7 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addDocumentOptions = function (self,
                                 {
                                     xtype: 'hidden',
                                     name: 'website_section_id',
-                                    value: record.data.id.split('_')[1]
+                                    value: record.get('recordId')
                                 },
                                 {
                                     xtype: 'hidden',
@@ -102,15 +94,16 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addDocumentOptions = function (self,
                                     value: record.data.siteId
                                 }
                             ]
-                        }),
+                        },
                         buttons: [
                             {
                                 text: 'Submit',
                                 listeners: {
                                     'click': function (button) {
                                         var window = button.findParentByType('window');
-                                        var formPanel = window.query('.form')[0];
+                                        var formPanel = window.down('form');
                                         formPanel.getForm().submit({
+                                            method: 'post',
                                             reset: true,
                                             waitMsg: 'Creating document section...',
                                             success: function (form, action) {
@@ -118,7 +111,7 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addDocumentOptions = function (self,
                                                 if (obj.success) {
                                                     record.appendChild(obj.node);
 
-                                                    var centerRegion = Ext.getComp('knitkitCenterRegion');
+                                                    var centerRegion = Ext.getCmp('knitkitCenterRegion');
                                                     centerRegion.editContent(obj.documented_content.title, obj.documented_content.id, obj.documented_content.body_html, record.data.siteId, 'article');
                                                     window.close();
                                                 }
@@ -153,6 +146,7 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addDocumentOptions = function (self,
         });
     }
 
+    // Edit Document Section
     if (currentUser.hasCapability('edit', 'WebsiteSection')) {
         var contentInfo = record.data['contentInfo'];
 
@@ -234,7 +228,7 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addDocumentOptions = function (self,
                                 {
                                     xtype: 'hidden',
                                     name: 'id',
-                                    value: record.data.id.split('_')[1]
+                                    value: record.get('recordId')
                                 }
                             ]
                         }),
@@ -279,13 +273,140 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addDocumentOptions = function (self,
         });
     }
 
+    // Copy Document Section
+    items.push({
+        text: 'Copy Document',
+        iconCls: 'icon-copy',
+        listeners: {
+            'click': function () {
+                Ext.widget("window", {
+                    layout: 'fit',
+                    modal: true,
+                    title: 'Copy Document',
+                    plain: true,
+                    buttonAlign: 'center',
+                    items: {
+                        xtype: 'form',
+                        labelWidth: 110,
+                        frame: false,
+                        bodyStyle: 'padding:5px 5px 0',
+                        url: '/knitkit/erp_app/desktop/online_document_sections/copy',
+                        defaults: {
+                            width: 375
+                        },
+                        items: [
+                            {
+                                xtype: 'combo',
+                                name: 'parent_section_id',
+                                width: 320,
+                                loadingText: 'Retrieving Sections...',
+                                store: Ext.create("Ext.data.Store", {
+                                    proxy: {
+                                        type: 'ajax',
+                                        url: '/knitkit/erp_app/desktop/online_document_sections/existing_documents',
+                                        reader: {
+                                            type: 'json'
+                                        },
+                                        extraParams: {
+                                            website_id: websiteId
+                                        }
+                                    },
+                                    autoLoad: true,
+                                    fields: [
+                                        {
+                                            name: 'id'
+                                        },
+                                        {
+                                            name: 'title_permalink'
+
+                                        }
+                                    ]
+                                }),
+                                forceSelection: true,
+                                allowBlank: true,
+                                fieldLabel: 'Parent Document',
+                                mode: 'local',
+                                displayField: 'title_permalink',
+                                valueField: 'id',
+                                triggerAction: 'all'
+                            },
+                            {
+                                xtype: 'textfield',
+                                fieldLabel: 'Title',
+                                width: 320,
+                                value: record.data.text,
+                                name: 'title'
+                            },
+                            {
+                                xtype: 'hidden',
+                                name: 'id',
+                                value: sectionId
+                            },
+                            {
+                                xtype: 'hidden',
+                                name: 'website_id',
+                                value: websiteId
+                            }
+                        ]
+                    },
+                    buttons: [
+                        {
+                            text: 'Submit',
+                            listeners: {
+                                'click': function (button) {
+                                    var window = button.findParentByType('window');
+                                    var formPanel = window.query('.form')[0];
+
+                                    formPanel.getForm().submit({
+                                        waitMsg: 'Copying document section...',
+                                        success: function (form, action) {
+                                            var obj = Ext.decode(action.response.responseText);
+                                            var values = formPanel.getValues();
+                                            var parentNode = record.getOwnerTree().getRootNode();
+
+                                            if (!Ext.isEmpty(values.parent_section_id)) {
+                                                parentNode = parentNode.findChildBy(function (node) {
+                                                    if (node.get('recordType') == 'WebsiteSection'
+                                                        && node.get('recordId') == values.parent_section_id) {
+                                                        return true;
+                                                    }
+                                                }, this, true);
+                                            }
+
+                                            if (parentNode && parentNode != record.getOwnerTree().getRootNode()){
+                                                record.getOwnerTree().getStore().load({node: parentNode});
+                                            }
+
+                                            window.close();
+                                        },
+                                        failure: function (form, action) {
+                                            var obj = Ext.decode(action.response.responseText);
+                                            Ext.Msg.alert("Error", obj.message);
+                                        }
+                                    });
+                                }
+                            }
+                        },
+                        {
+                            text: 'Close',
+                            handler: function (btn) {
+                                btn.up('window').close();
+                            }
+                        }
+                    ]
+                }).show();
+            }
+        }
+    });
+
+    // Delete Document Section
     if (currentUser.hasCapability('delete', 'WebsiteSection')) {
         items.push({
             text: 'Delete Document Section',
             iconCls: 'icon-delete',
             listeners: {
                 'click': function () {
-                    Ext.MessageBox.confirm('Confirm', 'Are you sure you want to delete this document section?', function (btn) {
+                    Ext.MessageBox.confirm('Confirm', 'Are you sure you want to delete the document section?<h3>'+record.data["text"]+'</h3>', function (btn) {
                         if (btn == 'no') {
                             return false;
                         }
@@ -297,7 +418,6 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addDocumentOptions = function (self,
                                     id: sectionId
                                 },
                                 success: function (response) {
-
                                     var obj = Ext.decode(response.responseText);
                                     if (obj.success) {
                                         record.remove();
@@ -312,8 +432,6 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addDocumentOptions = function (self,
                             });
                         }
                     });
-
-                    record.remove();
                 }
             }
         });

data/{public → app/assets}/javascripts/erp_app/desktop/applications/knitkit/west_region/helpers/host.js

@@ -9,6 +9,7 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addHostOptions = function (self, ite
                         title: 'Update Host',
                         modal: true,
                         buttonAlign: 'center',
+                        defaultFocus: 'host',
                         items: Ext.create("Ext.form.Panel", {
                             labelWidth: 50,
                             frame: false,
@@ -23,6 +24,7 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addHostOptions = function (self, ite
                                     fieldLabel: 'Host',
                                     id: 'knitkitUpdateWebsiteHostHost',
                                     name: 'host',
+                                    itemId: 'host',
                                     value: record.data.host,
                                     allowBlank: false
                                 }
@@ -52,7 +54,9 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addHostOptions = function (self, ite
                                                 }
                                             },
                                             failure: function (form, action) {
-                                                Ext.Msg.alert("Error", "Error updating Host");
+                                                var obj = Ext.decode(action.response.responseText);
+                                                var message = obj.message.indexOf('Host') == 0 ? obj.message : "Error Updating Host"
+                                                Ext.Msg.alert("Error", message);
                                             }
                                         });
                                     }

data/{public → app/assets}/javascripts/erp_app/desktop/applications/knitkit/west_region/helpers/menu.js

@@ -12,6 +12,7 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addMenuOptions = function (self, ite
                         title: 'New Menu Item',
                         modal: true,
                         buttonAlign: 'center',
+                        defaultFocus: 'title',
                         items: Ext.create('Ext.form.Panel', {
                             labelWidth: 50,
                             frame: false,
@@ -25,6 +26,7 @@ Compass.ErpApp.Desktop.Applications.Knitkit.addMenuOptions = function (self, ite
                                     xtype: 'textfield',
                                     fieldLabel: 'Title',
                                     width: 320,
+                                    itemId: 'title',
                                     allowBlank: false,
                                     name: 'title'
                                 },