knitkit 2.0.0 → 2.0.1

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

@@ -4,8 +4,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CommentsGridPanel",{
   approve : function(rec){
     var self = this;
     self.initialConfig['centerRegion'].setWindowStatus('Approving Comment...');
-    var conn = new Ext.data.Connection();
-    conn.request({
+    Ext.Ajax.request({
       url: '/knitkit/erp_app/desktop/comments/approve',
       method: 'POST',
       params:{
@@ -34,8 +33,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CommentsGridPanel",{
   deleteComment : function(rec){
     var self = this;
     self.initialConfig['centerRegion'].setWindowStatus('Deleting Comment...');
-    var conn = new Ext.data.Connection();
-    conn.request({
+    Ext.Ajax.request({
       url: '/knitkit/erp_app/desktop/comments/delete',
       method: 'POST',
       params:{

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

@@ -2,10 +2,36 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.EastRegion",{
     extend:"Ext.TabPanel",
     alias:'widget.knitkit_eastregion',
     initComponent: function() {
-        this.imageAssetsPanel = new Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel();
+        this.imageAssetsPanel = new Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel(this.initialConfig['module']);
         this.widgetsPanel = new Compass.ErpApp.Desktop.Applications.Knitkit.WidgetsPanel();
         this.fileAssetsPanel = new Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel(this.initialConfig['module']);
-        this.items = [this.imageAssetsPanel.layout, this.fileAssetsPanel.layout, this.widgetsPanel.layout];
+        this.items = [];
+
+        if (currentUser.hasApplicationCapability('knitkit', {
+            capability_type_iid:'view',
+            resource:'GlobalImageAsset'
+        }) || currentUser.hasApplicationCapability('knitkit', {
+            capability_type_iid:'view',
+            resource:'SiteImageAsset'
+        }))
+
+        {
+            this.items.push(this.imageAssetsPanel.layout)
+        }
+
+        if (currentUser.hasApplicationCapability('knitkit', {
+            capability_type_iid:'view',
+            resource:'GlobalFileAsset'
+        }) || currentUser.hasApplicationCapability('knitkit', {
+            capability_type_iid:'view',
+            resource:'SiteFileAsset'
+        }))
+
+        {
+            this.items.push(this.fileAssetsPanel.layout)
+        }
+        
+        this.items.push(this.widgetsPanel.layout)
 
         this.callParent(arguments);
         this.setActiveTab(0);
@@ -14,7 +40,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.EastRegion",{
     constructor : function(config) {
         config = Ext.apply({
             id:'knitkitEastRegion',
-			region:'east',
+            region:'east',
             width:300,
             split:true,
             autoDestroy:true,

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

@@ -1,13 +1,44 @@
 Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel = function(module) {
-  this.websiteId = null;
-  var self = this;
-  self.module = module;
+    this.websiteId = null;
+    var self = this;
+    self.module = module;
 			
+  this.changeSecurityOnFile = function(node, secure, model, websiteId){
+    var msg = secure ? 'Securing file...' : 'Unsecuring file...';
+    var waitMsg = Ext.Msg.wait("Please Wait", msg);
+    Ext.Ajax.request({
+      url: '/knitkit/erp_app/desktop/file_assets/'+model+'/update_security',
+      method: 'POST',
+      params:{
+        path:node.get('id'),
+        secure:secure,
+        website_id:websiteId
+      },
+      success: function(response) {
+        var obj = Ext.decode(response.responseText);
+        if(obj.success){
+          waitMsg.hide();
+          if(secure){
+            node.set('iconCls', 'icon-document_lock');
+          }
+          else{
+            node.set('iconCls', 'icon-document');
+          }
+          node.set('isSecured',secure);
+          node.commit();
+        }
+        else{
+          Ext.Msg.alert('Error', 'Error securing file.');
+        }
+      },
+      failure: function(response) {
+        waitMsg.hide();
+        Ext.Msg.alert('Error', 'Error securing file.');
+      }
+    });
+  };
+
   this.sharedFileAssetsTreePanel = Ext.create("Compass.ErpApp.Shared.FileManagerTree",{
-    //TODO_EXTJS4 this is added to fix error should be removed when extjs 4 releases fix.
-    viewConfig:{
-      loadMask: false
-    },
     title:'Shared',
     allowDownload:false,
     addViewContentsToContextMenu:false,
@@ -18,6 +49,18 @@ Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel = function(module) {
     url:'/knitkit/erp_app/desktop/file_assets/shared/expand_directory',
     containerScroll: true,
     additionalContextMenuItems:[{
+      nodeType:'leaf',
+      text:'View Details',
+      iconCls:'icon-add',
+      listeners:{
+        scope:self,
+        'click':function(){
+          var node = this.sharedFileAssetsTreePanel.selectedNode;
+          Ext.Msg.alert('Details', 'URL: /download/'+node.data.text+'?path='+node.data.downloadPath);
+        }
+      }
+    },
+    {
       nodeType:'leaf',
       text:'Insert link at cursor',
       iconCls:'icon-add',
@@ -27,27 +70,84 @@ Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel = function(module) {
           var node = this.sharedFileAssetsTreePanel.selectedNode;
           Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
             if(btn == 'ok'){
-              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="#" onclick="window.open(\'/erp_app/public/download_file/?path='+node.data.downloadPath+'\',\'mywindow\',\'width=400,height=200\');return false;">'+text+'</a>');
+              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'">'+text+'</a>');
+            }
+          });
+        }
+      }      
+    },
+    {
+      nodeType:'leaf',
+      text:'Insert link at cursor (inline)',
+      iconCls:'icon-add',
+      listeners:{
+        scope:self,
+        'click':function(){
+          var node = this.sharedFileAssetsTreePanel.selectedNode;
+          Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
+            if(btn == 'ok'){
+              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'&disposition=inline">'+text+'</a>');
+            }
+          });
+        }
+      }      
+    },
+    {
+      nodeType:'leaf',
+      text:'Insert link at cursor (prompt)',
+      iconCls:'icon-add',
+      listeners:{
+        scope:self,
+        'click':function(){
+          var node = this.sharedFileAssetsTreePanel.selectedNode;
+          Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
+            if(btn == 'ok'){
+              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'&disposition=attachment">'+text+'</a>');
             }
           });
         }
       }
+    },
+    {
+      nodeType:'leaf',
+      text:'Update Security',
+      iconCls:'icon-document_lock',
+      listeners:{
+        scope:self,
+        'click':function(){
+          var node = this.sharedFileAssetsTreePanel.selectedNode;
+          self.changeSecurityOnFile(node, !node.get('isSecured'), 'shared');
+        }
+      }
     }],
     listeners:{
+      'allowdelete':function(){
+         return currentUser.hasApplicationCapability('knitkit', {
+         capability_type_iid:'delete',
+         resource:'GlobalFileAsset'
+       });
+    },
+      'allowupload':function(){
+        return currentUser.hasApplicationCapability('knitkit', {
+        capability_type_iid:'upload',
+        resource:'GlobalFileAsset'
+      });
+    },
       'itemclick':function(view, record, item, index, e){
         e.stopEvent();
         return false;
       },
       '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');
+        return false;
+      }
     }
   });
 
   this.websiteFileAssetsTreePanel = Ext.create("Compass.ErpApp.Shared.FileManagerTree",{
-    //TODO_EXTJS4 this is added to fix error should be removed when extjs 4 releases fix.
-    viewConfig:{
-      loadMask: false
-    },
+    autoLoadRoot:false,
     title:'Website',
     allowDownload:false,
     addViewContentsToContextMenu:false,
@@ -59,7 +159,35 @@ Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel = function(module) {
     containerScroll: true,
     additionalContextMenuItems:[{
       nodeType:'leaf',
-      text:'Insert link at cursor',
+      text:'View Details',
+      iconCls:'icon-add',
+      listeners:{
+        scope:self,
+        'click':function(){
+          var node = this.websiteFileAssetsTreePanel.selectedNode;
+          Ext.Msg.alert('Details', 'URL: /download/'+node.data.text+'?path='+node.data.downloadPath);
+        }
+      }
+    },
+    {
+      nodeType:'leaf',
+      text:'Insert link at cursor (inline)',
+      iconCls:'icon-add',
+      listeners:{
+        scope:self,
+        'click':function(){
+          var node = this.websiteFileAssetsTreePanel.selectedNode;
+          Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
+            if(btn == 'ok'){
+              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'">'+text+'</a>');
+            }
+          });
+        }
+      }      
+    },
+    {
+      nodeType:'leaf',
+      text:'Insert link at cursor (prompt)',
       iconCls:'icon-add',
       listeners:{
         scope:self,
@@ -67,34 +195,79 @@ Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel = function(module) {
           var node = this.websiteFileAssetsTreePanel.selectedNode;
           Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
             if(btn == 'ok'){
-              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="#" onclick="window.open(\'/erp_app/public/download_file/?path='+node.data.downloadPath+'\',\'mywindow\',\'width=400,height=200\');return false;">'+text+'</a>');
+              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'&disposition=attachment">'+text+'</a>');
             }
           });
         }
       }
+    },
+    {
+      nodeType:'leaf',
+      text:'Update Security',
+      iconCls:'icon-document_lock',
+      listeners:{
+        scope:self,
+        'click':function(){
+          var node = this.websiteFileAssetsTreePanel.selectedNode;
+          self.changeSecurityOnFile(node, !node.get('isSecured'), 'website', this.websiteId);
+        }
+      }
     }],
     listeners:{
+      scope:self,
+      'show': function(){
+        self.reloadWebsiteFileAssetsTreePanel(self.websiteId);
+      },
       'itemclick':function(view, record, item, index, e){
         e.stopEvent();
         return false;
       },
       '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');
+        return false;
+      }
     }
   });
-    
+  
+  var items = [];
+
+    if (currentUser.hasApplicationCapability('knitkit', {
+        capability_type_iid:'view',
+        resource:'GlobalFileAsset'
+    }))
+
+    {
+        items.push(this.sharedFileAssetsTreePanel);
+    }
+
+    if (currentUser.hasApplicationCapability('knitkit', {
+        capability_type_iid:'view',
+        resource:'SiteFileAsset'
+    }))
+
+    {
+        items.push(this.websiteFileAssetsTreePanel);
+    }
+  
   this.layout = Ext.create('Ext.panel.Panel',{
     layout: 'fit',
     title:'Files',
     items: Ext.create('Ext.tab.Panel',{
-      items:[this.sharedFileAssetsTreePanel, this.websiteFileAssetsTreePanel]
-      })
+      items:items
+    })
   });
 
   this.selectWebsite = function(websiteId){
     this.websiteId = websiteId;
+    this.reloadWebsiteFileAssetsTreePanel(websiteId);
+  }
+
+  this.reloadWebsiteFileAssetsTreePanel = function(websiteId){
     this.websiteFileAssetsTreePanel.extraPostData = {
-      website_id:websiteId
+      website_id:websiteId,
+      websiteid:websiteId // for xhrFileUpload to work
     };
     this.websiteFileAssetsTreePanel.getStore().setProxy({
       type: 'ajax',
@@ -106,4 +279,3 @@ Compass.ErpApp.Desktop.Applications.Knitkit.FileAssetsPanel = function(module) {
     this.websiteFileAssetsTreePanel.getStore().load();
   }
 }
-

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

@@ -1,30 +1,31 @@
 Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsDataView",{
-    extend:"Ext.view.View",
-    alias:'widget.knitkit_imageassetsdataview',
+  extend:"Ext.view.View",
+  alias:'widget.knitkit_imageassetsdataview',
   
-    constructor : function(config) {
-        config = Ext.apply({
-	        autoDestroy:true,
-	        style:'overflow:auto',
-	        store: Ext.create('Ext.data.Store', {
-	            proxy: {
-	                type: 'ajax',
-	                url: config['url'],
-	                reader: {
-	                    type: 'json',
-	                    root: 'images'
-	                }
-	            },
-	            fields:['name', 'url','shortName']
-	        }),
-	        tpl: new Ext.XTemplate(
-	            '<tpl for=".">',
-	            '<div class="thumb-wrap" id="{name}">',
-	            '<div class="thumb"><img src="{url}" alt="{name}" class="thumb-img"></div>',
-	            '<span>{shortName}</span></div>',
-	            '</tpl>')
-	    }, config);
+  constructor : function(config) {
+    config = Ext.apply({
+      autoDestroy:true,
+      style:'overflow:auto',
+      itemSelector: 'div.thumb-wrap',
+      store: Ext.create('Ext.data.Store', {
+        proxy: {
+          type: 'ajax',
+          url: config['url'],
+          reader: {
+            type: 'json',
+            root: 'images'
+          }
+        },
+        fields:['name', 'url','shortName']
+      }),
+      tpl: new Ext.XTemplate(
+        '<tpl for=".">',
+        '<div class="thumb-wrap" id="{name}">',
+        '<div class="thumb"><img src="{url}" alt="{name}" class="thumb-img"></div>',
+        '<span>{shortName}</span></div>',
+        '</tpl>')
+    }, config);
 
-        this.callParent([config]);
-    }
+    this.callParent([config]);
+  }
 });

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

@@ -1,6 +1,8 @@
-Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel = function() {
-  var self = this;
+Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel = function(module) {
   this.websiteId = null;
+  var self = this;
+  self.module = module;
+
   this.sharedImageAssetsDataView = Ext.create("Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsDataView",{
     url: '/knitkit/erp_app/desktop/image_assets/shared/get_images'
   });
@@ -9,10 +11,6 @@ Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel = function() {
   });
 
   this.sharedImageAssetsTreePanel = Ext.create("Compass.ErpApp.Shared.FileManagerTree",{
-    //TODO_EXTJS4 this is added to fix error should be removed when extjs 4 releases fix.
-    viewConfig:{
-      loadMask: false
-    },
     region:'north',
     rootText:'Images',
     collapsible:true,
@@ -25,7 +23,79 @@ Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel = function() {
     url:'/knitkit/erp_app/desktop/image_assets/shared/expand_directory',
     containerScroll: true,
     height:200,
+    additionalContextMenuItems:[{
+      nodeType:'leaf',
+      text:'View Details',
+      iconCls:'icon-add',
+      listeners:{
+        scope:self,
+        'click':function(){
+          var node = this.sharedImageAssetsTreePanel.selectedNode;
+          Ext.Msg.alert('Details', 'URL: /download/'+node.data.text+'?path='+node.data.downloadPath);
+        }
+      }
+    },
+    {
+      nodeType:'leaf',
+      text:'Insert link at cursor',
+      iconCls:'icon-add',
+      listeners:{
+        scope:self,
+        'click':function(){
+          var node = this.sharedImageAssetsTreePanel.selectedNode;
+          Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
+            if(btn == 'ok'){
+              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'">'+text+'</a>');
+            }
+          });
+        }
+      }
+    },
+    {
+      nodeType:'leaf',
+      text:'Insert link at cursor (inline)',
+      iconCls:'icon-add',
+      listeners:{
+        scope:self,
+        'click':function(){
+          var node = this.sharedImageAssetsTreePanel.selectedNode;
+          Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
+            if(btn == 'ok'){
+              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'&disposition=inline">'+text+'</a>');
+            }
+          });
+        }
+      }
+    },
+    {
+      nodeType:'leaf',
+      text:'Insert link at cursor (prompt)',
+      iconCls:'icon-add',
+      listeners:{
+        scope:self,
+        'click':function(){
+          var node = this.sharedImageAssetsTreePanel.selectedNode;
+          Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
+            if(btn == 'ok'){
+              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'&disposition=attachment">'+text+'</a>');
+            }
+          });
+        }
+      }
+    }],
     listeners:{
+           'allowdelete':function(){
+                return currentUser.hasApplicationCapability('knitkit', {
+                    capability_type_iid:'delete',
+                    resource:'GlobalImageAsset'
+                });
+            },
+            'allowupload':function(){
+                return currentUser.hasApplicationCapability('knitkit', {
+                    capability_type_iid:'upload',
+                    resource:'GlobalImageAsset'
+                });
+            },
       'itemclick':function(view, record, item, index, e){
         e.stopEvent();
         if(!record.data["leaf"]){
@@ -47,16 +117,17 @@ Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel = function() {
       'fileUploaded':function(fileTreePanel, node){
         var store = self.sharedImageAssetsDataView.getStore();
         store.load();
-      }
+      },
+      'downloadfile':function(fileTreePanel, node){
+        window.open("/download/"+node.data.text+"?path=" + node.data.downloadPath+'&disposition=attachment','mywindow','width=400,height=200');
+        return false;
+      }      
     }
   });
 
   this.websiteImageAssetsTreePanel = Ext.create("Compass.ErpApp.Shared.FileManagerTree",{
-    //TODO_EXTJS4 this is added to fix error should be removed when extjs 4 releases fix.
+    autoLoadRoot:false,
     region:'north',
-    viewConfig:{
-      loadMask: false
-    },
     rootText:'Images',
     collapsible:true,
     allowDownload:false,
@@ -68,6 +139,50 @@ Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel = function() {
     url:'/knitkit/erp_app/desktop/image_assets/website/expand_directory',
     containerScroll: true,
     height:200,
+    additionalContextMenuItems:[{
+      nodeType:'leaf',
+      text:'View Details',
+      iconCls:'icon-add',
+      listeners:{
+        scope:self,
+        'click':function(){
+          var node = this.websiteImageAssetsTreePanel.selectedNode;
+          Ext.Msg.alert('Details', 'URL: /download/'+node.data.text+'?path='+node.data.downloadPath);
+        }
+      }
+    },
+    {
+      nodeType:'leaf',
+      text:'Insert link at cursor (prompt)',
+      iconCls:'icon-add',
+      listeners:{
+        scope:self,
+        'click':function(){
+          var node = this.websiteImageAssetsTreePanel.selectedNode;
+          Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
+            if(btn == 'ok'){
+              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'">'+text+'</a>');
+            }
+          });
+        }
+      }
+    },
+    {
+      nodeType:'leaf',
+      text:'Insert link at cursor (prompt)',
+      iconCls:'icon-add',
+      listeners:{
+        scope:self,
+        'click':function(){
+          var node = this.websiteImageAssetsTreePanel.selectedNode;
+          Ext.MessageBox.prompt('Display Name', 'Please enter display name:', function(btn, text){
+            if(btn == 'ok'){
+              self.module.centerRegion.insertHtmlIntoActiveCkEditor('<a href="/download/'+node.data.text+'?path='+node.data.downloadPath+'&disposition=attachment">'+text+'</a>');
+            }
+          });
+        }
+      }
+    }],
     listeners:{
       'itemclick':function(view, record, item, index, e){
         if(self.websiteId != null){
@@ -101,6 +216,10 @@ Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel = function() {
             website_id:self.websiteId
           }
         });
+      },
+      'downloadfile':function(fileTreePanel, node){
+        window.open("/download/"+node.data.text+"?path=" + node.data.downloadPath+'&disposition=attachment','mywindow','width=400,height=200');
+        return false;
       }
     }
   });
@@ -130,31 +249,59 @@ Compass.ErpApp.Desktop.Applications.Knitkit.ImageAssetsPanel = function() {
   var websiteImagesLayout =  Ext.create('Ext.panel.Panel',{
     layout: 'border',
     title:'Website',
-    items: [this.websiteImageAssetsTreePanel, websiteImagesPanel]
+    items: [this.websiteImageAssetsTreePanel, websiteImagesPanel],
+    listeners:{
+      scope:self,
+      'show': function(){
+        self.reloadWebsiteImageAssetsTreePanel(self.websiteId);
+      }       
+    }
   });
 
+ var items = [];
+    if (currentUser.hasApplicationCapability('knitkit', {
+        capability_type_iid:'view',
+        resource:'GlobalImageAsset'
+    }))
+
+    {
+        items.push(sharedImagesLayout);
+    }
+
+    if (currentUser.hasApplicationCapability('knitkit', {
+        capability_type_iid:'view',
+        resource:'SiteImageAsset'
+    }))
+
+    {
+        items.push(websiteImagesLayout);
+    }
+
   this.layout = Ext.create('Ext.panel.Panel',{
     layout:'fit',
     title:'Images',
     items: Ext.create('Ext.tab.Panel',{
-      items: [sharedImagesLayout, websiteImagesLayout]
+      items: items
     })
   });
 
   this.selectWebsite = function(websiteId){
     this.websiteId = websiteId;
+  }
+
+  this.reloadWebsiteImageAssetsTreePanel = function(websiteId){
     this.websiteImageAssetsTreePanel.extraPostData = {
-      website_id:websiteId
+      website_id:websiteId,
+      websiteid:websiteId // for xhrFileUpload to work      
     };
-    var store = this.websiteImageAssetsTreePanel.getStore();
-    store.load({
-      params:{
+    this.websiteImageAssetsTreePanel.getStore().setProxy({
+      type: 'ajax',
+      url:'/knitkit/erp_app/desktop/image_assets/website/expand_directory',
+      extraParams:{
         website_id:websiteId
       }
     });
+    this.websiteImageAssetsTreePanel.getStore().load();
     this.websiteImageAssetsDataView.getStore().removeAll();
   }
 }
-
-
-