knitkit 3.0.0 → 3.2.0

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

@@ -35,9 +35,15 @@ Ext.define('SiteContentsModel', {
         'parentItemId',
         'tag_list',
         // if an article is part of a blog then you can edit the excerpt
-        'canEditExcerpt',
-        {name: 'createdAt', mapping: 'created_at', type: 'date'},
-        {name: 'updatedAt', mapping: 'updated_at', type: 'date'}
+        'canEditExcerpt', {
+            name: 'createdAt',
+            mapping: 'created_at',
+            type: 'date'
+        }, {
+            name: 'updatedAt',
+            mapping: 'updated_at',
+            type: 'date'
+        }
     ]
 });
 
@@ -57,7 +63,7 @@ var siteContentsStore = Ext.create('Ext.data.TreeStore', {
         expanded: true
     },
     listeners: {
-        beforeexpand: function (node, eOpts) {
+        beforeexpand: function(node, eOpts) {
             if (!node.isRoot()) {
                 var tree = node.getOwnerTree();
                 tree.getStore().getProxy().setExtraParam('record_type', node.get('recordType'));
@@ -77,7 +83,7 @@ var viewConfigItems = {
     markDirty: false,
     plugins: pluginItems,
     listeners: {
-        'beforedrop': function (dom, data, overModel, dropPosition, dropHandlers, options) {
+        'beforedrop': function(dom, data, overModel, dropPosition, dropHandlers, options) {
             var record = data.records.first();
 
             if (record.get('objectType') == 'Article') {
@@ -86,7 +92,7 @@ var viewConfigItems = {
                 }
             }
         },
-        'drop': function (dom, data, overModel, dropPosition, options) {
+        'drop': function(dom, data, overModel, dropPosition, options) {
             var positionArray = [],
                 record = data.records.first(),
                 result = true,
@@ -95,67 +101,59 @@ var viewConfigItems = {
             if (record.get('isSection') || record.get('isDocument')) {
                 // if the record is modified and the parentId has changed we need to change
                 // the section parent
-                if (record.modified && record.modified.parentId) {
-                    Ext.Ajax.request({
-                        url: '/knitkit/erp_app/desktop/position/change_section_parent',
-                        method: 'PUT',
-                        params: {
-                            section_id: record.get('id').split('_')[1],
-                            parent_id: record.get('parentId').split('_')[1]
-                        },
-                        success: function (response) {
-                            var obj = Ext.decode(response.responseText);
-                            if (!obj.success) {
-                                Ext.Msg.alert("Error", obj.message);
-                                result = false;
-                            }
-                        },
-                        failure: function (response) {
-                            Ext.Msg.alert('Error', 'Error saving positions.');
-                            result = false;
-                        }
+                var parentNode = null;
+                
+                if (dropPosition == 'append') {
+                    positionArray.push({
+                        id: record.get('recordId'),
+                        parent_id: overModel.get('recordId'),
+                        position: 0
                     });
+
+                    parentNode = overModel;
+                } else {
+                    parentNode = overModel.parentNode;
                 }
-                else {
-                    overModel.parentNode.eachChild(function (node) {
-                        if (node.get('isSection') || record.get('isDocument')) {
-                            positionArray.push({
-                                id: node.data.id.split('_')[1],
-                                position: counter
-                            });
-                            counter++;
-                        }
-                    });
 
-                    Ext.Ajax.request({
-                        url: '/knitkit/erp_app/desktop/position/update_section_position',
-                        method: 'PUT',
-                        jsonData: {
-                            position_array: positionArray
-                        },
-                        success: function (response) {
-                            var obj = Ext.decode(response.responseText);
-                            if (!obj.success) {
-                                Ext.Msg.alert("Error", obj.message);
-                                result = false;
-                            }
-                        },
-                        failure: function (response) {
-                            Ext.Msg.alert('Error', 'Error saving positions.');
+                parentNode.eachChild(function(node) {
+                    if (node.get('isSection') || record.get('isDocument')) {
+                        positionArray.push({
+                            id: node.get('recordId'),
+                            parent_id: node.parentNode.get('recordId'),
+                            position: counter
+                        });
+
+                        counter++;
+                    }
+                });
+
+                Ext.Ajax.request({
+                    url: '/knitkit/erp_app/desktop/position/update_section_position',
+                    method: 'PUT',
+                    jsonData: {
+                        position_array: positionArray
+                    },
+                    success: function(response) {
+                        var obj = Ext.decode(response.responseText);
+                        if (!obj.success) {
+                            Ext.Msg.alert("Error", obj.message);
                             result = false;
                         }
-                    });
-                }
+                    },
+                    failure: function(response) {
+                        Ext.Msg.alert('Error', 'Error saving positions.');
+                        result = false;
+                    }
+                });
             }
             // this is an article
             else {
                 if (record.modified && record.modified.parentId) {
                     result = false;
-                }
-                else {
-                    overModel.parentNode.eachChild(function (node) {
+                } else {
+                    overModel.parentNode.eachChild(function(node) {
                         positionArray.push({
-                            id: node.get('id'),
+                            id: node.get('recordId'),
                             position: counter
                         });
                         counter++;
@@ -168,16 +166,16 @@ var viewConfigItems = {
                             position_array: positionArray
                         },
                         params: {
-                            section_id: record.parentNode.get('id').split('_')[1]
+                            section_id: record.parentNode.get('recordId')
                         },
-                        success: function (response) {
+                        success: function(response) {
                             var obj = Ext.decode(response.responseText);
                             if (!obj.success) {
                                 Ext.Msg.alert("Error", obj.message);
                                 result = false;
                             }
                         },
-                        failure: function (response) {
+                        failure: function(response) {
                             Ext.Msg.alert('Error', 'Error saving positions.');
                             result = false;
                         }
@@ -202,7 +200,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.SiteContentsTreePanel", {
     store: siteContentsStore,
     enableDD: true,
 
-    editSectionLayout: function (sectionName, sectionId, websiteId) {
+    editSectionLayout: function(sectionName, sectionId, websiteId) {
         var self = this;
 
         Ext.Ajax.request({
@@ -211,40 +209,37 @@ Ext.define("Compass.ErpApp.Desktop.Applications.SiteContentsTreePanel", {
             params: {
                 id: sectionId
             },
-            success: function (response) {
+            success: function(response) {
                 self.initialConfig['centerRegion'].editSectionLayout(
                     sectionName,
                     websiteId,
                     sectionId,
-                    response.responseText,
-                    [
-                        {
-                            text: 'Insert Content Area',
-                            handler: function (btn) {
-                                var codeMirror = btn.findParentByType('codemirror');
-                                Ext.MessageBox.prompt('New File', 'Please enter content area name:', function (btn, text) {
-                                    if (btn == 'ok') {
-                                        codeMirror.insertContent('<%=render_content_area(:' + text + ')%>');
-                                    }
+                    response.responseText, [{
+                        text: 'Insert Content Area',
+                        handler: function(btn) {
+                            var codeMirror = btn.findParentByType('codemirror');
+                            Ext.MessageBox.prompt('New File', 'Please enter content area name:', function(btn, text) {
+                                if (btn == 'ok') {
+                                    codeMirror.insertContent('<%=render_content_area(:' + text + ')%>');
+                                }
 
-                                });
-                            }
+                            });
                         }
-                    ]);
+                    }]);
             },
-            failure: function (response) {
+            failure: function(response) {
                 Ext.Msg.alert('Error', 'Error loading section layout.');
             }
         });
     },
 
-    clearWebsite: function () {
+    clearWebsite: function() {
         var store = this.getStore();
         store.getProxy().extraParams = {};
         store.load();
     },
 
-    selectWebsite: function (website) {
+    selectWebsite: function(website) {
         var store = this.getStore();
         store.getProxy().extraParams = {
             website_id: website.id
@@ -253,51 +248,69 @@ Ext.define("Compass.ErpApp.Desktop.Applications.SiteContentsTreePanel", {
     },
 
     listeners: {
-        'itemclick': function (view, record, htmlItem, index, e) {
+        itemclick: function(view, record, htmlItem, index, e) {
+            var url = null;
             var self = this;
             e.stopEvent();
+
             if (record.data['isSection']) {
                 self.initialConfig['centerRegion'].openIframeInTab(record.data.text, record.data['url']);
-            }
-            else if (record.data['objectType'] === "Article") {
-                var url = '/knitkit/erp_app/desktop/articles/show/' + record.data.id;
+            } else if (record.data['objectType'] === "Article") {
+                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) {
+                    success: function(response) {
                         var article = Ext.decode(response.responseText);
-                        self.initialConfig['centerRegion'].editContent(record.data.text, record.data.id, article.body_html, record.data['siteId'], 'article');
+                        self.initialConfig['centerRegion'].editContent(record.data.text, record.get('recordId'), article.body_html, record.data['siteId'], 'article');
+                    },
+                    failure: function() {
+                        Ext.Msg.alert('Error', 'Could not load content');
                     }
                 });
-            }
-            else if (record.data['isDocument']) {
+            } else if (record.data['isDocument']) {
+                url = '/knitkit/erp_app/desktop/online_document_sections/' + record.get('recordId') + '/content/';
                 var contentInfo = record.data['contentInfo'];
-                if (record.data['useMarkdown']) {
-                    self.initialConfig['centerRegion'].editDocumentationMarkdown(
-                        contentInfo.title,
-                        record.data['siteId'],
-                        contentInfo.id,
-                        contentInfo.body_html,
-                        []
-                    );
-                }
-                else {
-                    self.initialConfig['centerRegion'].editContent(
-                        record.data['contentInfo'].title,
-                        record.data['contentInfo'].id,
-                        record.data['contentInfo'].body_html,
-                        record.data['siteId'],
-                        'article'
-                    );
-                }
+
+                Ext.Ajax.request({
+                    url: url,
+                    method: 'GET',
+                    timeout: 90000,
+                    success: function(response) {
+                        var result = Ext.decode(response.responseText);
+                        if (result.success) {
+                            if (record.data['useMarkdown']) {
+                                self.initialConfig['centerRegion'].editDocumentationMarkdown(
+                                    contentInfo.title,
+                                    record.data['siteId'],
+                                    contentInfo.id,
+                                    result.content, []
+                                );
+                            } else {
+                                self.initialConfig['centerRegion'].editContent(
+                                    contentInfo.title,
+                                    contentInfo.id,
+                                    result.content,
+                                    record.data['siteId'],
+                                    'article'
+                                );
+                            }
+                        } else {
+                            Ext.Msg.alert('Error', 'Could not load content');
+                        }
+                    },
+                    failure: function() {
+                        Ext.Msg.alert('Error', 'Could not load content');
+                    }
+                });
             }
         },
-        'itemcontextmenu': function (view, record, htmlItem, index, e) {
+        itemcontextmenu: function(view, record, htmlItem, index, e) {
             e.stopEvent();
             var items = [];
 
@@ -306,7 +319,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.SiteContentsTreePanel", {
                     text: 'View In Web Navigator',
                     iconCls: 'icon-globe',
                     listeners: {
-                        'click': function () {
+                        'click': function() {
                             var webNavigator = window.compassDesktop.getModule('web-navigator-win');
                             webNavigator.createWindow(record.data['url']);
                         }
@@ -337,24 +350,16 @@ Ext.define("Compass.ErpApp.Desktop.Applications.SiteContentsTreePanel", {
 
             if (record.data['isSection']) {
                 items = Compass.ErpApp.Desktop.Applications.Knitkit.addSectionOptions(self, items, record);
-            }
-            else if (record.data['isWebsite']) {
+            } else if (record.data['isWebsite']) {
                 items = Compass.ErpApp.Desktop.Applications.Knitkit.addWebsiteOptions(self, items, record);
             }
 
-            if (items.length != 0) {
+            if (items.length !== 0) {
                 var contextMenu = Ext.create("Ext.menu.Menu", {
                     items: items
                 });
                 contextMenu.showAt(e.xy);
             }
         }
-    },
-
-    initComponent: function (config) {
-        config = Ext.apply({
-        }, config);
-
-        this.callParent([config]);
     }
 });

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

@@ -22,6 +22,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ThemesTreePanel", {
 
         Ext.create("Ext.window.Window", {
             layout: 'fit',
+            modal: true,
             width: 375,
             title: 'Theme Widget',
             plain: true,
@@ -171,8 +172,93 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ThemesTreePanel", {
         });
     },
 
-    deleteTheme: function (themeId) {
-        var self = this;
+    showUpdateThemeForm: function(node){
+        Ext.create("Ext.window.Window", {
+            layout: 'fit',
+            modal: true,
+            title: 'Rename Theme',
+            width: 360,
+            plain: true,
+            buttonAlign: 'center',
+            defaultFocus: 'name',
+            items: Ext.create('widget.form', {
+                labelWidth: 110,
+                frame: false,
+                bodyStyle: 'padding:5px 5px 0',
+                fileUpload: true,
+                url: '/knitkit/erp_app/desktop/theme/update',
+                defaults: {
+                    width: 320
+                },
+                items: [
+                    {
+                        xtype: 'hidden',
+                        name: 'id',
+                        value: node.get('id')
+                    },
+                    {
+                        xtype: 'textfield',
+                        fieldLabel: 'Name',
+                        value: node.get('name'),
+                        allowBlank: false,
+                        name: 'name',
+                        itemId: 'name'
+                    }
+                ]
+            }),
+            buttons: [
+                {
+                    text: 'Submit',
+                    listeners: {
+                        'click': function (button) {
+                            var window = button.findParentByType('window'),
+                                formPanel = window.query('form')[0],
+                                
+                                westRegion = Ext.ComponentQuery.query('#knitkitWestRegion').first(),
+                                themesTreePanel = westRegion.down('#themesTreePanel');
+
+
+                            var loading = new Ext.LoadMask(window, {msg: 'Please wait...'});
+                            loading.show();
+
+                            formPanel.getForm().submit({
+                                reset: true,
+                                timeout: 300000,
+                                success: function (form, action) {
+                                    loading.hide();
+                                    window.close();
+
+                                    var obj = Ext.decode(action.response.responseText);
+                                    if (obj.success) {
+                                        // update node
+                                        node.set('name', obj.theme.name);
+                                        node.set('text', obj.theme.text);
+                                        node.commit();
+                                    }
+                                },
+                                failure: function (form, action) {
+                                    loading.hide();
+
+                                    Ext.Msg.alert("Error", "Error updating theme");
+                                }
+                            });
+                        }
+                    }
+                },
+                {
+                    text: 'Close',
+                    handler: function (btn) {
+                        btn.up('window').close();
+                    }
+                }
+            ]
+        }).show();
+    },
+
+    deleteTheme: function (theme) {
+        var self = this,
+            themeId = theme.get('id');
+
         self.initialConfig['centerRegion'].setWindowStatus('Deleting theme...');
         Ext.Ajax.request({
             url: '/knitkit/erp_app/desktop/theme/delete',
@@ -184,9 +270,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ThemesTreePanel", {
                 var obj = Ext.decode(response.responseText);
                 if (obj.success) {
                     self.initialConfig['centerRegion'].clearWindowStatus();
-                    self.getStore().load({
-                        node: self.getRootNode()
-                    });
+                    theme.parentNode.removeChild(theme);
                 }
                 else {
                     Ext.Msg.alert('Error', 'Error deleting theme');
@@ -226,6 +310,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ThemesTreePanel", {
             fields: [
                 'isTheme',
                 'themeId',
+                'name',
                 'isActive',
                 'siteId',
                 'text',
@@ -238,9 +323,6 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ThemesTreePanel", {
             scroll: 'vertical',
             //containerScroll: true,
             listeners: {
-                'load': function (store) {
-                    store.getRootNode().expandChildren();
-                },
                 'showImage': function (fileManager, node, themeId) {
                     var themeId = null;
                     var themeNode = node;
@@ -267,7 +349,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ThemesTreePanel", {
                     }
                     self.initialConfig['centerRegion'].editTemplateFile(node, content, [], themeId);
                 },
-                'handleContextMenu': function (fileManager, node, e) {
+                'handleContextMenu': function (fileManager, node, item, index, e) {
                     var items = [];
 
                     if (node.isRoot()) {
@@ -307,12 +389,21 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ThemesTreePanel", {
                                             return false;
                                         }
                                         else if (btn == 'yes') {
-                                            self.deleteTheme(node.data.id);
+                                            self.deleteTheme(node);
                                         }
                                     });
                                 }
                             }
                         });
+                        items.push({
+                            text: 'Rename Theme',
+                            iconCls: 'icon-edit',
+                            listeners: {
+                                'click': function () {
+                                    self.showUpdateThemeForm(node);
+                                }
+                            }
+                        });
                         items.push({
                             text: 'Export',
                             iconCls: 'icon-document_out',