knitkit 3.0.0 → 3.2.0

data/app/assets/javascripts/erp_app/desktop/applications/knitkit/comments_grid_panel.js

@@ -0,0 +1,214 @@
+Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CommentsGridPanel", {
+    extend: "Ext.grid.Panel",
+    alias: 'widget.knitkit_commentsgridpanel',
+
+    approve: function (rec) {
+        var self = this;
+        self.initialConfig['centerRegion'].setWindowStatus('Approving Comment...');
+        Ext.Ajax.request({
+            url: '/knitkit/erp_app/desktop/comments/approve',
+            method: 'POST',
+            params: {
+                id: rec.get("id")
+            },
+            success: function (response) {
+                var obj = Ext.decode(response.responseText);
+                if (obj.success) {
+                    self.initialConfig['centerRegion'].clearWindowStatus();
+                    self.getStore().load();
+                }
+                else {
+                    Ext.Msg.alert('Error', 'Error approving comemnt');
+                    self.initialConfig['centerRegion'].clearWindowStatus();
+                }
+            },
+            failure: function (response) {
+                self.initialConfig['centerRegion'].clearWindowStatus();
+                Ext.Msg.alert('Error', 'Error approving comemnt');
+            }
+        });
+
+
+    },
+
+    deleteComment: function (rec) {
+        var self = this;
+        self.initialConfig['centerRegion'].setWindowStatus('Deleting Comment...');
+        Ext.Ajax.request({
+            url: '/knitkit/erp_app/desktop/comments/delete',
+            method: 'POST',
+            params: {
+                id: rec.get("id")
+            },
+            success: function (response) {
+                var obj = Ext.decode(response.responseText);
+                if (obj.success) {
+                    self.initialConfig['centerRegion'].clearWindowStatus();
+                    self.getStore().load();
+                }
+                else {
+                    Ext.Msg.alert('Error', 'Error deleting comemnt');
+                    self.initialConfig['centerRegion'].clearWindowStatus();
+                }
+            },
+            failure: function (response) {
+                self.initialConfig['centerRegion'].clearWindowStatus();
+                Ext.Msg.alert('Error', 'Error deleting comemnt');
+            }
+        });
+    },
+
+    initComponent: function () {
+        this.callParent(arguments);
+        this.getStore().load();
+    },
+
+    constructor: function (config) {
+        var self = this;
+
+        var store = Ext.create('Ext.data.Store', {
+            proxy: {
+                type: 'ajax',
+                url: '/knitkit/erp_app/desktop/comments/index/' + config['contentId'],
+                reader: {
+                    type: 'json',
+                    root: 'comments'
+                }
+            },
+            remoteSort: true,
+            fields: [
+                {
+                    name: 'id'
+                },
+                {
+                    name: 'commentor_name'
+                },
+                {
+                    name: 'email'
+                },
+                {
+                    name: 'created_at'
+                },
+                {
+                    name: 'approved?'
+                },
+                {
+                    name: 'comment'
+                },
+                {
+                    name: 'approved_by_username'
+                },
+                {
+                    name: 'approved_at'
+                }
+            ]
+        });
+
+        config = Ext.apply({
+            store: store,
+            columns: [
+                {
+                    header: 'Commentor',
+                    sortable: true,
+                    flex: 1,
+                    dataIndex: 'commentor_name'
+                },
+                {
+                    header: 'Email',
+                    sortable: true,
+                    flex: 1,
+                    dataIndex: 'email'
+                },
+                {
+                    header: 'Commented On',
+                    dataIndex: 'created_at',
+                    flex: 1,
+                    sortable: true,
+                    renderer: Ext.util.Format.dateRenderer('m/d/Y H:i:s')
+                },
+                {
+                    menuDisabled: true,
+                    resizable: false,
+                    xtype: 'actioncolumn',
+                    header: 'View',
+                    align: 'center',
+                    width: 50,
+                    items: [{
+                        icon: '/assets/icons/eye/eye_16x16.png',
+                        tooltip: 'View',
+                        handler: function (grid, rowIndex, colIndex) {
+                            var rec = grid.getStore().getAt(rowIndex);
+                            self.initialConfig['centerRegion'].showComment(rec.get('comment'));
+                        }
+                    }]
+                },
+                {
+                    menuDisabled: true,
+                    resizable: false,
+                    xtype: 'actioncolumn',
+                    header: 'Approve',
+                    align: 'center',
+                    width: 100,
+                    items: [{
+                        getClass: function (v, meta, rec) {  // Or return a class from a function
+                            if (rec.get('approved?')) {
+                                this.items[0].tooltip = 'Approved';
+                                return 'approved-col';
+                            } else {
+                                this.items[0].tooltip = 'Approve';
+                                return 'approve-col';
+                            }
+                        },
+                        handler: function (grid, rowIndex, colIndex) {
+                            var rec = grid.getStore().getAt(rowIndex);
+                            if (rec.get('approved?')) {
+                                return false;
+                            }
+                            else {
+                                self.approve(rec)
+                            }
+                        }
+                    }]
+                },
+                {
+                    header: 'Approved By',
+                    sortable: true,
+                    flex: 1,
+                    dataIndex: 'approved_by_username'
+                },
+                {
+                    header: 'Approved At',
+                    sortable: true,
+                    flex: 1,
+                    dataIndex: 'approved_at',
+                    renderer: Ext.util.Format.dateRenderer('m/d/Y H:i:s')
+                },
+                {
+                    menuDisabled: true,
+                    resizable: false,
+                    xtype: 'actioncolumn',
+                    header: 'Delete',
+                    align: 'center',
+                    width: 100,
+                    items: [{
+                        icon: '/assets/icons/delete/delete_16x16.png',
+                        tooltip: 'Delete',
+                        handler: function (grid, rowIndex, colIndex) {
+                            var rec = grid.getStore().getAt(rowIndex);
+                            self.deleteComment(rec);
+                        }
+                    }]
+                }
+            ],
+            bbar: Ext.create("Ext.PagingToolbar", {
+                pageSize: 10,
+                store: store,
+                displayInfo: true,
+                displayMsg: '{0} - {1} of {2}',
+                emptyMsg: "Empty"
+            })
+        }, config);
+
+        this.callParent([config]);
+    }
+});

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

@@ -11,12 +11,16 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel", {
         this.changeSecurityOnFile = function (node, secure, model, websiteId) {
             var updateUrl = '/knitkit/erp_app/desktop/file_assets/' + model + '/update_security';
             Ext.Ajax.request({
-                url: '/knitkit/erp_app/desktop/available_roles',
-                method: 'POST',
+                url: '/api/v1/security_roles',
+                method: 'GET',
+                params:{
+                    parent: 'website_builder',
+                    include_admin: true
+                },
                 success: function (response) {
                     var obj = Ext.decode(response.responseText);
                     if (obj.success) {
-                        Ext.create('widget.knikit_selectroleswindow', {
+                        Ext.create('widget.selectroleswindow', {
                             baseParams: {
                                 path: node.get('id'),
                                 website_id: websiteId
@@ -144,12 +148,12 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel", {
                     e.stopEvent();
                     return false;
                 },
-                'fileDeleted': function (fileTreePanel, node) {
+                'filedeleted': function (fileTreePanel, node) {
                 },
-                'fileUploaded': function (fileTreePanel, node) {
+                'fileuploaded': function (fileTreePanel, node) {
                 },
                 'downloadfile': function (fileTreePanel, node) {
-                    window.open("/download/" + node.data.text + "?path=" + node.data.downloadPath, 'mywindow', 'width=400,height=200');
+                    window.open("/download/" + node.data.text + "?path=" + node.data.downloadPath + '&disposition=attachment', 'mywindow', 'width=400,height=200');
                     return false;
                 }
             }
@@ -239,22 +243,16 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel", {
                     store.getRootNode().data.text = self.websiteName;
                     self.websiteFileAssetsTreePanel.view.refresh();
                 },
-                'show': function (panel) {
-                    // workaround for extJS rendering bug. tree tries to load faster than extjs can render, wait X ms
-                    setTimeout(function () {
-                        self.reloadWebsiteFileAssetsTreePanel(self.websiteId);
-                    }, 100);
-                },
                 'itemclick': function (view, record, item, index, e) {
                     e.stopEvent();
                     return false;
                 },
-                'fileDeleted': function (fileTreePanel, node) {
+                'filedeleted': function (fileTreePanel, node) {
                 },
-                'fileUploaded': function (fileTreePanel, node) {
+                'fileuploaded': function (fileTreePanel, node) {
                 },
                 'downloadfile': function (fileTreePanel, node) {
-                    window.open("/download/" + node.data.text + "?path=" + node.data.downloadPath, 'mywindow', 'width=400,height=200');
+                    window.open("/download/" + node.data.text + "?path=" + node.data.downloadPath + '&disposition=attachment', 'mywindow', 'width=400,height=200');
                     return false;
                 }
             }
@@ -310,14 +308,14 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel", {
 
         var items = [];
 
-        if (currentUser.hasCapability('view', 'GlobalFileAsset')) {
-            items.push(this.sharedFileAssetsTreePanel);
-        }
-
         if (currentUser.hasCapability('view', 'SiteFileAsset')) {
             items.push(this.websiteFileAssetsTreePanel);
         }
 
+        if (currentUser.hasCapability('view', 'GlobalFileAsset')) {
+            items.push(this.sharedFileAssetsTreePanel);
+        }
+
         config = Ext.apply({
             deferredRender: false,
             layout: 'fit',

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

@@ -3,6 +3,11 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsDataView", {
     alias: 'widget.knitkit_imageassetsdataview',
     directory: null,
     websiteId: null,
+
+    setPath: function (path) {
+        this.title.update('Path: ' + path);
+    },
+
     constructor: function (config) {
         var self = this;
 
@@ -16,7 +21,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsDataView", {
 
                 Compass.ErpApp.Utility.addEventHandler(viewElement.dom, 'dragover', function (e) {
                     viewElement.setStyle('border', 'solid 1px red');
-                    e.preventDefault()
+                    e.preventDefault();
                 });
                 Compass.ErpApp.Utility.addEventHandler(viewElement.dom, 'dragenter', function () {
                     viewElement.setStyle('border', 'solid 1px red');
@@ -52,10 +57,11 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsDataView", {
                                     if (resultObj.success) {
                                         store.load({
                                             params: {
+                                                website_id: self.websiteId,
                                                 directory: self.directory
                                             }
                                         });
-                                        self.fireEvent('imageuploaded', self);
+                                        self.fireEvent('imageuploaded', self, resultObj.node);
                                     }
                                     else {
                                         Ext.Msg.alert('Error', 'Could not upload image');
@@ -85,7 +91,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsDataView", {
 
             var contextMenu = Ext.create("Ext.menu.Menu", {
                 items: [
-                   {
+                    {
                         text: 'Insert Image At Cursor',
                         iconCls: 'icon-add',
                         handler: function () {
@@ -106,6 +112,10 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsDataView", {
             autoDestroy: true,
             style: 'overflow:auto',
             itemSelector: 'div.thumb-wrap',
+            renderTpl: [
+                '<div id="{id}-title">{title}</div>'
+            ],
+            childEls: ["title"],
             store: Ext.create('Ext.data.Store', {
                 proxy: {
                     type: 'ajax',

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

@@ -13,23 +13,19 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel", {
             uploadUrl: '/knitkit/erp_app/desktop/image_assets/shared/upload_file',
             module: config.module,
             listeners: {
-                afterrender: function () {
-                    if (currentUser.hasCapability('view', 'GlobalImageAsset')) {
-                        self.sharedImageAssetsDataView.directory = 'root_node';
-                        var store = self.sharedImageAssetsDataView.getStore();
-                        store.load({
-                            params: {
-                                directory: 'root_node'
-                            }
-                        });
+                imageuploaded: function (comp, node) {
+                    var record = self.sharedImageAssetsTreePanel.selectedDirectoryNode;
+
+                    if (!record.isExpanded() && !record.isLoaded()) {
+                        record.expand();
                     }
-                },
-                imageuploaded: function (comp) {
-                    self.sharedImageAssetsTreePanel.getStore().load({
-                        callback: function () {
-                            self.sharedImageAssetsTreePanel.getView().refresh();
+                    else {
+                        record.appendChild(node);
+
+                        if (!record.isExpanded()) {
+                            record.expand();
                         }
-                    });
+                    }
                 }
             }
         });
@@ -38,18 +34,19 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel", {
             url: '/knitkit/erp_app/desktop/image_assets/website/get_images',
             uploadUrl: '/knitkit/erp_app/desktop/image_assets/website/upload_file',
             listeners: {
-                imageuploaded: function (comp) {
-                    var store = self.websiteImageAssetsTreePanel.getStore();
-                    store.load({
-                        callback: function () {
-                            self.websiteImageAssetsDataView.getStore().load({
-                                params: {
-                                    directory: 'root_node',
-                                    website_id: self.websiteId
-                                }
-                            });
+                imageuploaded: function (comp, node) {
+                    var record = self.websiteImageAssetsTreePanel.selectedDirectoryNode;
+
+                    if (!record.isExpanded() && !record.isLoaded()) {
+                        record.expand();
+                    }
+                    else {
+                        record.appendChild(node);
+
+                        if (!record.isExpanded()) {
+                            record.expand();
                         }
-                    });
+                    }
                 }
             }
         });
@@ -98,6 +95,8 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel", {
                 'itemclick': function (view, record, item, index, e) {
                     e.stopEvent();
                     if (!record.data["leaf"]) {
+                        this.selectedDirectoryNode = record;
+                        self.sharedImageAssetsDataView.setPath(record.getPath('text'));
                         self.sharedImageAssetsDataView.directory = record.data.id;
                         var store = self.sharedImageAssetsDataView.getStore();
                         store.load({
@@ -110,17 +109,15 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel", {
                         return false;
                     }
                 },
-                'fileDeleted': function (fileTreePanel, node) {
-                    var store = self.sharedImageAssetsDataView.getStore();
-                    store.load({
+                'filedeleted': function (fileTreePanel, node) {
+                    self.sharedImageAssetsDataView.getStore().load({
                         params: {
                             directory: node.parentNode.data.id
                         }
                     });
                 },
-                'fileUploaded': function (fileTreePanel, node) {
-                    var store = self.sharedImageAssetsDataView.getStore();
-                    store.load({
+                'fileuploaded': function (fileTreePanel, node) {
+                    self.sharedImageAssetsDataView.getStore().load({
                         params: {
                             directory: node.data.id
                         }
@@ -177,6 +174,8 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel", {
                     if (self.websiteId !== null) {
                         e.stopEvent();
                         if (!record.data["leaf"]) {
+                            this.selectedDirectoryNode = record;
+                            self.websiteImageAssetsDataView.setPath(record.getPath('text'));
                             self.websiteImageAssetsDataView.directory = record.data.id;
                             self.websiteImageAssetsDataView.websiteId = self.websiteId;
                             var store = self.websiteImageAssetsDataView.getStore();
@@ -192,15 +191,15 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel", {
                         }
                     }
                 },
-                'fileDeleted': function (fileTreePanel, node) {
+                'filedeleted': function (fileTreePanel, node) {
                     self.websiteImageAssetsDataView.getStore().load({
                         params: {
-                            directory: node.parentNode.data.downloadPath,
+                            directory: node.parentNode.data.id,
                             website_id: self.websiteId
                         }
                     });
                 },
-                'fileUploaded': function (fileTreePanel, node) {
+                'fileuploaded': function (fileTreePanel, node) {
                     self.websiteImageAssetsDataView.getStore().load({
                         params: {
                             directory: node.data.id,
@@ -241,13 +240,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel", {
             autoRender: true,
             layout: 'border',
             title: 'Website',
-            items: [this.websiteImageAssetsTreePanel, websiteImagesPanel],
-            listeners: {
-                scope: self,
-                'show': function (panel) {
-                    self.reloadWebsiteImageAssetsTreePanel(self.websiteId);
-                }
-            }
+            items: [this.websiteImageAssetsTreePanel, websiteImagesPanel]
         });
 
         this.selectWebsite = function (website) {
@@ -287,10 +280,12 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel", {
             });
 
             if (websiteId) {
-                while (delNode = this.websiteImageAssetsTreePanel.getRootNode().childNodes[0]) {
-                    this.websiteImageAssetsTreePanel.getRootNode().removeChild(delNode);
+                var rootNode = this.websiteImageAssetsTreePanel.getRootNode();
+
+                while (delNode = rootNode.childNodes[0]) {
+                    rootNode.removeChild(delNode);
                 }
-                this.websiteImageAssetsTreePanel.getRootNode().expand();
+                rootNode.expand();
 
                 if (!this.websiteImageAssetsTreePanel.getStore().isLoading()) {
                     this.websiteImageAssetsTreePanel.getStore().load();
@@ -300,6 +295,10 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel", {
                         params: {
                             directory: 'root_node',
                             website_id: websiteId
+                        },
+                        callback: function () {
+                            self.websiteImageAssetsTreePanel.selectedDirectoryNode = rootNode;
+                            self.websiteImageAssetsDataView.setPath('/' + rootNode.data.text);
                         }
                     });
                 }
@@ -307,14 +306,15 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel", {
         };
 
         var items = [];
-        if (currentUser.hasCapability('view', 'GlobalImageAsset')) {
-            items.push(sharedImagesLayout);
-        }
 
         if (currentUser.hasCapability('view', 'SiteImageAsset')) {
             items.push(websiteImagesLayout);
         }
 
+        if (currentUser.hasCapability('view', 'GlobalImageAsset')) {
+            items.push(sharedImagesLayout);
+        }
+
         config = Ext.apply({
             deferredRender: false,
             layout: 'fit',
@@ -325,6 +325,17 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel", {
                 afterrender: function (panel) {
                     // workaround for extJS rendering bug. set activetab 1 above and 0 afterrender
                     panel.setActiveTab(0);
+
+                    // load shared assets
+                    var rootNode = panel.sharedImageAssetsTreePanel.getRootNode();
+                    panel.sharedImageAssetsTreePanel.selectedDirectoryNode = rootNode;
+                    panel.sharedImageAssetsDataView.setPath(rootNode.getPath('text'));
+                    panel.sharedImageAssetsDataView.directory = rootNode.data.id;
+                    panel.sharedImageAssetsDataView.getStore().load({
+                        params: {
+                            directory: rootNode.data.id
+                        }
+                    });
                 }
             }
         }, config);