#4033 Cannot remove public access to my widget view

www/class/centreonCustomView.class.php

@@ -204,7 +204,7 @@ class CentreonCustomView
     public function getCustomViews()
     {
         if (!isset($this->customViews)) {
-            $query = "SELECT cv.custom_view_id, name, layout, is_owner, locked, user_id, usergroup_id
+            $query = "SELECT cv.custom_view_id, name, layout, is_owner, locked, user_id, usergroup_id, public
             		  FROM custom_views cv, custom_view_user_relation cvur
             		  WHERE cv.custom_view_id = cvur.custom_view_id
                       AND cvur.is_consumed = 1 
@@ -220,6 +220,7 @@ class CentreonCustomView
             while ($row = $res->fetchRow()) {
                 $cvid = $row['custom_view_id'];
                 $tmp[$cvid]['name'] = $row['name'];
+                $tmp[$cvid]['public'] = $row['public'];
                 if (!isset($tmp[$cvid]['is_owner']) || !$tmp[$cvid]['is_owner'] || $row['user_id']) {
                     $tmp[$cvid]['is_owner'] = $row['is_owner'];
                 }

www/include/common/webServices/rest/centreon_wscustomview.class.php

@@ -63,7 +63,7 @@ class CentreonWscustomview extends CentreonWebService {
                 'default' => false,
                 'name' => $tab['name'],
                 'custom_view_id' => $tab['custom_view_id'],
-                'public' => false,
+                'public' => $tab['public'],
                 'nbCols' => $tab['layout']
             );
         }

www/include/home/customViews/index.ihtml

@@ -413,7 +413,7 @@ function submitEditView() {
           if (jQuery(elem).data('cvId') == viewId) {
             jQuery(elem).data('name', jQuery("#formEditView input[name='name']").val());
             jQuery(elem).data('nbCols', jQuery('#formEditView input[name="layout[layout]"]:checked').val());
-            jQuery(elem).data('public', (jQuery('#formAddView input[name="public"]:checked').length ? true : false));
+            jQuery(elem).data('public', (jQuery('#formEditView input[name="public"]:checked').length ? true : false));
             jQuery(elem).find('a').text(jQuery("#formEditView input[name='name']").val());
           }
         });
@@ -839,10 +839,15 @@ jQuery(function () {
     var tabActive = jQuery(
       jQuery('#tabs .ui-tabs-selected.ui-state-active')[0]
     );
+
     jQuery('#formEditView input[name="custom_view_id"]').val(tabActive.data('cvId'));
     jQuery('#formEditView input[name="name"]').val(tabActive.data('name'));
     jQuery('#formEditView input[name="layout[layout]"][value="' + tabActive.data('nbCols') + '"]').prop('checked', true);
+    if (tabActive.data('public') == '1') {
         jQuery('#formEditView input[name="public"]').prop('checked', true);
+    } else {
+        jQuery('#formEditView input[name="public"]').prop('checked', false);
+    }
   });
   
   /* Initialize popin */

www/include/home/customViews/index.php

@@ -98,11 +98,14 @@ try {
             . " SELECT cv.*, '0' as from_public FROM custom_views cv "
             . " INNER JOIN custom_view_user_relation cvur on cv.custom_view_id = cvur.custom_view_id "
             . " WHERE cvur.user_id = " . $db->escape($centreon->user->user_id). " AND cvur.is_consumed = 0 ";
+    
+
     $DBRES = $db->query($query);
     $arrayView = array();
     $arrayView[-1] = "";
     $arrayViewShared = array();
     $arrayViewShared[-1] = "";
+    
     while($row = $DBRES->fetchRow()) {
         if($row['from_public'] == '1'){
             $arrayView[$row['custom_view_id']] = $row['name'];
@@ -134,7 +137,7 @@ try {
     $formAddView->addGroup($layouts, 'layout', _("Layout"), ' ');
     $formAddView->setDefaults(array('layout[layout]' => 'column_1'));
 
-    $formAddView->addElement('checkbox', 'public', _("Public"));
+    $formAddView->addElement('checkbox', 'public', '', _("Public"));
 
     /**
      * Submit button
@@ -177,8 +180,7 @@ try {
     $formEditView->addGroup($layouts, 'layout', _("Layout"), ' ');
     $formEditView->setDefaults(array('layout[layout]' => 'column_1'));
 
-    $formEditView->addElement('checkbox', 'public', _("Public"), $attrsText);
-
+    $formEditView->addElement('checkbox', 'public', '', _("Public"));
     /**
      * Submit button
      */