Pman.Tab.CmsBlog.bjs

Pman.Tab.CmsBlog.js

diff --git a/Pman.Tab.CmsBlog.bjs b/Pman.Tab.CmsBlog.bjs
index b4da40b..039a062 100644 (file)
--- a/Pman.Tab.CmsBlog.bjs
+++ b/Pman.Tab.CmsBlog.bjs
@@ -104,7 +104,7 @@
           {
            "listeners" : {
             "update" : "function (_self, record, operation)\n{\n    if (operation != 'commit') {\n        return;\n    }\n    // only used to change active status.\n    \n    new Pman.request({\r\n        method : 'POST',\r\n        url : baseURL + '/Roo/Cms_page',\r\n        params : {\r\n            id : record.data.id,\r\n            is_draft : record.data.is_draft\r\n        },\n        success : function(res) {\n           _this.grid.footer.onClick('refresh');\n       }\r\n    });\n}",
-            "beforeload" : "function (_self, options)\n{\n    if (Pman.building || !Pman.Tab.Cms.panel.active) {\n        return false;\n    }\n    \n    var sel = _this.category_grid.getSelectionModel().getSelected();\n    \n    if(!sel || sel.data.pid * 1 < 1){\n        this.removeAll();\n        return false;\n    }\n    \n    options.params._with_primary_image = 1;\n    \n    var cm = _this.grid.colModel;\n    var vis = {\n        category_type_id_name : true,\n        menu_page_id_title : true\n    };\n    \n    var cm = _this.grid.getColumnModel();\n    \n    function cid(str) {\n        return cm.getIndexByDataIndex(str);\n    }\n    \n    options.params['search[name]'] = _this.searchBox.getValue();\n    \n    options.params._exclude_columns = 'body,extended';\n    \n    if(sel.data.type == 'page_type'){\n        options.params._page_type_id = sel.data.pid;\n    }\n    \n    if(sel.data.type == 'category'){\n        options.params._category_id = sel.data.pid;\n    }\n    \n    var size = _this.image_size_sel.getValue() * 1;\n    \n    cm.setHidden(cid('primary_image_id'), false);\n    cm.setColumnWidth(cid('primary_image_id'), size + 10);\n    \n    if(size == 0){\n        cm.setHidden(cid('primary_image_id'), true);\n    }\n    \n   // options.params._treeview = 1;\n    options.params._pman_short = 1;\n    \n    options.params.translation_of_id = 0;\n    \n    options.params._with_translation_type = 1;\n    \n    //options.params._requestMeta  = 1; // always fetch meta.. as different types return different data..\n    \n    \n    switch(sel.data.name) {\n        case 'page' : \n         //   options.params.limit = 9999;\n      //      _this.grid.footer.pageSize = 9999;\n            vis.menu_page_id_title = false;\n            cm.setHidden(cid('created'), true);\n            cm.setHidden(cid('published'), true);\n            cm.setHidden(cid('template_id_template'), false);   \n            this.sortInfo.field = 'tree_sequence'; // force sort.\n            this.sortInfo.direction = 'ASC'; // force sort.\n                         \n            break;\n        case 'blog' :\n         //   options.params.limit = 20;\n         //   options.params['search[category]'] = _this.category_type.getValue();\n         //   _this.grid.footer.pageSize = 20;\n            vis.menu_page_id_title = false;\n            cm.setHidden(cid('created'), false);\n            cm.setHidden(cid('published'), false);\n            cm.setHidden(cid('template_id_template'), true);\n            this.sortInfo.field = 'published'; // force sort.\n            this.sortInfo.direction = 'DESC'; // force sort.\n            \n            break;\n        \n        case 'menu' :\n        //    options.params.limit = 9999;\n        //    _this.grid.footer.pageSize = 9999;\n            vis.category_type_id_name = false;\n            cm.setHidden(cid('created'), true);\n            cm.setHidden(cid('published'), true);\n            cm.setHidden(cid('template_id_template'), true);\n            this.sortInfo.field = 'tree_sequence'; // force sort.\n            this.sortInfo.direction = 'ASC'; // force sort.\n            \n            break;\n        case 'category' :\n       //     options.params.limit = 20;\n      //      _this.grid.footer.pageSize = 20;\n            vis.menu_page_id_title = false;\n            cm.setHidden(cid('created'), false);\n            cm.setHidden(cid('published'), false);\n            cm.setHidden(cid('template_id_template'), true);\n            this.sortInfo.field = 'tree_sequence'; // force sort.\n            this.sortInfo.direction = 'ASC'; // force sort.\n             \n            break;\n    }\n    \n    if (_this.showDeleted.pressed) {\n        options.params._show_deleted = 1;\n    }\n    \n    for (var i in vis) {\n        cm.setHidden(cm.getIndexByDataIndex(i), !vis[i]);\n    }\n    \n}",
+            "beforeload" : "function (_self, options)\n{\n    if (Pman.building || !Pman.Tab.Cms.panel.active) {\n        return false;\n    }\n    \n    var sel = _this.category_grid.getSelectionModel().getSelected();\n    \n    if(!sel || sel.data.pid * 1 < 1){\n        this.removeAll();\n        return false;\n    }\n    \n    options.params._with_primary_image = 1;\n    \n    var cm = _this.grid.colModel;\n    var vis = {\n        category_type_id_name : true,\n        menu_page_id_title : true\n    };\n    \n    var cm = _this.grid.getColumnModel();\n    \n    function cid(str) {\n        return cm.getIndexByDataIndex(str);\n    }\n    \n    options.params['search[name]'] = _this.searchBox.getValue();\n    \n    options.params._exclude_columns = 'body,extended';\n    \n    if(sel.data.type == 'page_type'){\n        options.params._page_type_id = sel.data.pid;\n    }\n    if (sel.data.page_type > 0 ) {\n        options.params._page_type_id = sel.data.page_type;\n    }\n    \n    if(sel.data.type == 'category'){\n        options.params._category_id = sel.data.pid;\n    }\n    \n    var size = _this.image_size_sel.getValue() * 1;\n    \n    cm.setHidden(cid('primary_image_id'), false);\n    cm.setColumnWidth(cid('primary_image_id'), size + 10);\n    \n    if(size == 0){\n        cm.setHidden(cid('primary_image_id'), true);\n    }\n    \n   // options.params._treeview = 1;\n    options.params._pman_short = 1;\n    \n    options.params.translation_of_id = 0;\n    \n    options.params._with_translation_type = 1;\n    \n    //options.params._requestMeta  = 1; // always fetch meta.. as different types return different data..\n    \n    \n    switch(sel.data.name) {\n        case 'page' : \n         //   options.params.limit = 9999;\n      //      _this.grid.footer.pageSize = 9999;\n            vis.menu_page_id_title = false;\n            cm.setHidden(cid('created'), true);\n            cm.setHidden(cid('published'), true);\n            cm.setHidden(cid('template_id_template'), false);   \n            this.sortInfo.field = 'tree_sequence'; // force sort.\n            this.sortInfo.direction = 'ASC'; // force sort.\n                         \n            break;\n        case 'blog' :\n         //   options.params.limit = 20;\n         //   options.params['search[category]'] = _this.category_type.getValue();\n         //   _this.grid.footer.pageSize = 20;\n            vis.menu_page_id_title = false;\n            cm.setHidden(cid('created'), false);\n            cm.setHidden(cid('published'), false);\n            cm.setHidden(cid('template_id_template'), true);\n            this.sortInfo.field = 'published'; // force sort.\n            this.sortInfo.direction = 'DESC'; // force sort.\n            \n            break;\n        \n        case 'menu' :\n        //    options.params.limit = 9999;\n        //    _this.grid.footer.pageSize = 9999;\n            vis.category_type_id_name = false;\n            cm.setHidden(cid('created'), true);\n            cm.setHidden(cid('published'), true);\n            cm.setHidden(cid('template_id_template'), true);\n            this.sortInfo.field = 'tree_sequence'; // force sort.\n            this.sortInfo.direction = 'ASC'; // force sort.\n            \n            break;\n        case 'category' :\n       //     options.params.limit = 20;\n      //      _this.grid.footer.pageSize = 20;\n            vis.menu_page_id_title = false;\n            cm.setHidden(cid('created'), false);\n            cm.setHidden(cid('published'), false);\n            cm.setHidden(cid('template_id_template'), true);\n            this.sortInfo.field = 'tree_sequence'; // force sort.\n            this.sortInfo.direction = 'ASC'; // force sort.\n             \n            break;\n    }\n    \n    if (_this.showDeleted.pressed) {\n        options.params._show_deleted = 1;\n    }\n    \n    for (var i in vis) {\n        cm.setHidden(cm.getIndexByDataIndex(i), !vis[i]);\n    }\n    \n}",
             "load" : "function (_self, records, options)\n{\n    _this.child_element_panel.region.collapse();\n}"
            },
            "xtype" : "Store",

diff --git a/Pman.Tab.CmsBlog.js b/Pman.Tab.CmsBlog.js
index affce56..2049df8 100644 (file)
--- a/Pman.Tab.CmsBlog.js
+++ b/Pman.Tab.CmsBlog.js
@@ -610,6 +610,9 @@ Pman.Tab.CmsBlog = new Roo.XComponent({
               if(sel.data.type == 'page_type'){
                   options.params._page_type_id = sel.data.pid;
               }
+              if (sel.data.page_type > 0 ) {
+                  options.params._page_type_id = sel.data.page_type;
+              }
               
               if(sel.data.type == 'category'){
                   options.params._category_id = sel.data.pid;