[Noalyss-commit] [noalyss] 13/30: Administration user : add condition if no folder exists + esthetic

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit b50bde6c279642f3733e4b95702211ac6d00f61f
Author: Dany De Bontridder <address@hidden>
Date:   Mon Jun 1 21:17:39 2015 +0200

    Administration user  : add condition if no folder exists + esthetic
---
 html/js/admin.js            |    4 ++--
 include/class_dossier.php   |   10 +++++++++-
 include/user_detail.inc.php |   35 +++--------------------------------
 3 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/html/js/admin.js b/html/js/admin.js
index 80b01e5..448dc8b 100644
--- a/html/js/admin.js
+++ b/html/js/admin.js
@@ -45,7 +45,7 @@ function folder_display(p_user)
             var folder = {};
             var create = false;
             if (!$('folder_list_div')) {
-                folder = create_div({'id': 'folder_list_div', 'cssclass': 
"inner_box", 'style': 'width:90%,right:5%;top:100px;display:block'});
+                folder = create_div({'id': 'folder_list_div', 'cssclass': 
"inner_box", 'style': 'width:90%,right:5%;top:100px'});
                 create = true;
             }
             folder = $('folder_list_div');
@@ -83,7 +83,7 @@ function folder_remove(p_user,p_dossier )
         parameters: {"p_user": p_user, 'p_dossier': p_dossier, "op": 
"folder_remove", 'gDossier': 0},
         onSuccess: function (p_xml) {
             // table id = database_list
-            $('row'+p_dossier).hide();
+            new Effect.Opacity('row'+p_dossier, { from: 1.0, to: 0.0, 
duration: 0.2 });
             remove_waiting_box();
         }
     });
diff --git a/include/class_dossier.php b/include/class_dossier.php
index 81559a1..519dd99 100644
--- a/include/class_dossier.php
+++ b/include/class_dossier.php
@@ -108,7 +108,15 @@ class Dossier
         
        
     }
-
+    /**
+     * Count the number of folder in the repository
+     * @return integer
+     */
+    function count() 
+    {
+        $nb_folder=$this->cn->get_value('select count(*) from ac_dossier');
+        return $nb_folder;
+    }
     /*!
      * \brief Return all the users
      * as an array
diff --git a/include/user_detail.inc.php b/include/user_detail.inc.php
index b3f3b564..d4a457b 100644
--- a/include/user_detail.inc.php
+++ b/include/user_detail.inc.php
@@ -69,35 +69,6 @@ if (isset($_POST['SAVE']))
                }
         $UserChange->save();
 
- /**
-  * replace by ajax see ajax_admin.php
-  *        foreach ($_POST as $name => $elem)
-        // Update Priv on Folder
-  
-        {
-            if (substr_count($name, 'PRIV') != 0)
-            {
-                $cn = new Database();
-                               if ( defined ('MULTI')&& MULTI==0)
-                               {
-                                       $name=dbname;
-                                       $db_id=MONO_DATABASE;
-                                       $UserChange->set_folder_access($db_id, 
$elem);
-                               }
-                               else
-                               {
-                                   $db_id = mb_substr($name, 4);
-                                       $name=$cn->format_name($db_id, "dos");
-                                       if ( $cn->exist_database($name) == 1 )
-                                       {
-                                               
$UserChange->set_folder_access($db_id, $elem);
-                                               Dossier::synchro_admin($db_id);
-                                       }
-                               }
-                       }
-        }
-  * 
-  */
     }
 }
 else
@@ -210,15 +181,15 @@ $array = array(
     array('value' => 'R', 'label' => 'Utilisateur normal')
 );
 $repo = new Dossier(0);
-
-$Dossier = $repo->show_dossier('R',$UserChange->login);
-if (empty($Dossier))
+if ( $repo->count() == 0) 
 {
     echo hb('* Aucun Dossier *');
     echo '</div>';
     return;
 }
 
+$Dossier = $repo->show_dossier('R',$UserChange->login);
+
 $mod_user = new User(new Database(), $uid);
 ?>
            <TABLE id="database_list" class="result">