fix 'Optional parameter declared before required parameter is implicitly treated...

[Pman.Cms] / Pman.Tab.CmsBlog.js

diff --git a/Pman.Tab.CmsBlog.js b/Pman.Tab.CmsBlog.js
index 892fbd5..f029bcd 100644 (file)
--- a/Pman.Tab.CmsBlog.js
+++ b/Pman.Tab.CmsBlog.js
@@ -144,6 +144,12 @@ Pman.Tab.CmsBlog = new Roo.XComponent({
              if(s.data.id * 1 < 1){
                  return;\r
              }
+             if (s.data.is_deleted) {
+                 _this.deleteBtn.setText("Un-delete");
+             } else {
+                 _this.deleteBtn.setText("Delete");
+             } 
+             
              
              _this.prepanel.el.dom.src =  baseURL + '/Cms/PageThumb/' +  s.data.id;
              
@@ -163,6 +169,13 @@ Pman.Tab.CmsBlog = new Roo.XComponent({
                  });
                  return;
              }*/
+             if (s.data.is_deleted) {
+                 Roo.MessageBox.alert("Undelete this", "You need to un-delete this item before you can edit it");
+                 return;
+             }
+             
+             
+             
              _this.dialog.show(s.data, function() {
                  _this.grid.footer.onClick('refresh');
              }); 
@@ -330,7 +343,7 @@ Pman.Tab.CmsBlog = new Roo.XComponent({
                 
                 if(_this.grid.selModel.getSelections().length == 1){
                    ds = _this.grid.selModel.getSelected().data;
-                }
+                } 
                 
                 var page_type_id = 0;
                 var page_type_id_name = '';
@@ -338,12 +351,17 @@ Pman.Tab.CmsBlog = new Roo.XComponent({
                 
                 var sel = _this.category_grid.getSelectionModel().getSelected();
                 
+                if (!ds && !sel) {
+                    Roo.MessageBox.alert("Select Type", "Select Type of page on the left (category)");
+                    return;
+                }
+                
                 if(!ds && sel && sel.data.pid * 1 > 0 && sel.data.type == 'page_type'){
                     page_type_id = sel.data.pid;
                     page_type_id_name = sel.data.name;
                     page_type_id_display_name = sel.data.display_name;
                     
-                    if(sel.data.name == 'page'){
+                    if(ds && sel.data.name == 'page'){
                         page_type_id_display_name = 'Pages';
                     }
                     
@@ -352,7 +370,11 @@ Pman.Tab.CmsBlog = new Roo.XComponent({
                     }
                     
                 }
-            
+                var pid = '';
+                if(sel.data.name != 'blog'){
+                    pid = ds.id;
+                }
+                    
                 /*
                 var s = _this.page_type.selectedData;
                 
@@ -369,7 +391,7 @@ Pman.Tab.CmsBlog = new Roo.XComponent({
                
                 var q =   {
                     id : 0,
-                    parent_id : ds ? ds.id : '',
+                    parent_id : pid,
                     parent_id_title : ds ? ds.title : '',
                     page_link : ds && !ds.is_element ? (ds.page_link + '/') : '',
                     page_type_id : ds ? ds.page_type_id : page_type_id,
@@ -507,42 +529,50 @@ Pman.Tab.CmsBlog = new Roo.XComponent({
                     return;
                 }
                 
-                /*
-                Roo.MessageBox.confirm("Confirm", 
-                    "Are you sure you want to delete this, it can not be recovered if you make a mistake!", 
-                    function(res) {
-                        if (res != 'yes') {
-                            return;
-                        }
-                        new Pman.Request({
-                            method : 'POST',
-                            url : baseURL + '/Roo/cms_page',
-                            params : {
-                                _delete : sel.data.id
-                            },
-                            success : function() { 
-                                _this.grid.footer.onClick('refresh');
+                if (!sel.data.is_deleted) {
+                    Roo.MessageBox.confirm("Confirm", 
+                        "Are you sure you want to delete this, - to un-delete, select 'Show Deleted' at bottom, select this item and press this button again", 
+                        function(res) {
+                            if (res != 'yes') {
+                                return;
                             }
-                        });
-                        
+                            new Pman.Request({
+                                method : 'POST',
+                                mask : "Deleting",
+                                url : baseURL + '/Roo/cms_page',
+                                params : {
+                                    id : sel.data.id,
+                                    is_deleted : 1  
+                                },
+                                success : function() { 
+                                    _this.grid.footer.onClick('refresh');
+                                }
+                            });
                             
-                    }
-                );
-                
-                */
+                                
+                        }
+                    );
+                    return;
+                }
+              
                 
                 new Pman.Request({
                     method : 'POST',
                     url : baseURL + '/Roo/cms_page',
+                    mask: 'Un-deleting',
                     params : {
                         id : sel.data.id,
-                        is_deleted : 1
+                        is_deleted : 0
                     },
                     success : function() { 
                         _this.grid.footer.onClick('refresh');
                     }
                 });
                 
+            },
+           render : function (_self)
+            {
+                _this.deleteBtn = this;
             }
           },
           xns : Roo.Toolbar,
@@ -589,6 +619,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;
@@ -1086,7 +1119,8 @@ Pman.Tab.CmsBlog = new Roo.XComponent({
                  return;
              }
              
-             return String.format('<img src="{0}/Images/Thumb/{1}/{2}" width="{1}">', baseURL, size, v); 
+             return String.format('<img src="{0}/Images/Thumb/{1}/{2}" width="{1}" height="{3}">', 
+                     baseURL, size, v, Math.floor(size*0.6)); 
          },
          sortable : false,
          width : 75,
@@ -1349,8 +1383,8 @@ Pman.Tab.CmsBlog = new Roo.XComponent({
        items  : [
         {
          xtype : 'GridPanel',
-         autoScroll : true,
-         background : false,
+         autoScroll : false,
+         background : true,
          fitContainer : true,
          fitToframe : true,
          region : 'center',
@@ -1446,6 +1480,14 @@ Pman.Tab.CmsBlog = new Roo.XComponent({
                 {
                     'name': 'type',
                     'type': 'string'
+                },
+                {
+                    'name': 'page_type',
+                    'type': 'int'
+                },
+                {
+                    'name': 'category_id_is_draft',
+                    'type': 'int'
                 }
             ],
             id : 'id',
@@ -1472,7 +1514,12 @@ Pman.Tab.CmsBlog = new Roo.XComponent({
             xtype : 'ColumnModel',
             dataIndex : 'display_name',
             header : _this._strings['3adbdb3ac060038aa0e6e6c138ef9873'] /* Category */,
-            renderer : function(v,x,r) { 
+            renderer : function(v,x,r) 
+            { 
+                if(r.data.category_id_is_draft * 1 == 1){
+                    return String.format('<span style="text-decoration:line-through">{0}</span>', v ? v : ''); 
+                }
+                
                 return String.format('{0}', v ? v : '');
             },
             width : 200,
@@ -1836,6 +1883,10 @@ Pman.Tab.CmsBlog = new Roo.XComponent({
              {
                  'name': 'primary_image_id',
                  'type': 'int'
+             },
+             {
+                 'name': 'template_id_template',
+                 'type': 'string'
              }
          ],
          id : 'id',
@@ -1864,7 +1915,7 @@ Pman.Tab.CmsBlog = new Roo.XComponent({
              
              return String.format('<img src="{0}/Images/Thumb/40/{1}" width="40">', baseURL, v); 
          },
-         width : 75,
+         width : 50,
          xns : Roo.grid,
          '|xns' : 'Roo.grid'
         },
@@ -1878,7 +1929,7 @@ Pman.Tab.CmsBlog = new Roo.XComponent({
          
              return '<img class="x-grid-check-icon' + state + '" src="' + Roo.BLANK_IMAGE_URL + '"/>';
          },
-         width : 50,
+         width : 40,
          xns : Roo.grid,
          '|xns' : 'Roo.grid'
         },
@@ -1888,9 +1939,20 @@ Pman.Tab.CmsBlog = new Roo.XComponent({
          header : _this._strings['ce5bf551379459c1c61d2a204061c455'] /* Location */,
          renderer : function(v,x,r) { 
          
-             var fmt = (r.data.is_deleted ? '<s>{0}</s>' : '{0}');
+             var fmt = '';
+             
+             if(r.data.template_id_template.length){
+                 
+                 fmt = (r.data.is_deleted ? '<s>{0}<br/>{1}</s>' : '{0}<br/>{1}');
+                 
+                 return String.format(fmt, v, r.data.template_id_template);
+             }
+             
+             fmt = (r.data.is_deleted ? '<s>{0}</s>' : '{0}');
              
              return String.format( fmt, v);
+             
+             
           },
          width : 100,
          xns : Roo.grid,
@@ -1934,7 +1996,7 @@ Pman.Tab.CmsBlog = new Roo.XComponent({
              return ret.join("<br/>");
              
          },
-         width : 100,
+         width : 75,
          xns : Roo.grid,
          '|xns' : 'Roo.grid'
         },
@@ -1968,7 +2030,7 @@ Pman.Tab.CmsBlog = new Roo.XComponent({
              return v *1;
              
          },
-         width : 50,
+         width : 30,
          xns : Roo.grid,
          '|xns' : 'Roo.grid'
         }