From 3b192c1b296ea955f6fccfe9fb04403275140d0f Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 26 Apr 2010 17:48:02 +0000 Subject: [PATCH] --- .../Controlleur/class.extranet.core.php | 5 ++--- inc/ws/Controlleur/class.ws.flash.php | 5 ++--- inc/ws/Controlleur/class.ws.url.php | 6 +++--- inc/ws/DAO/class.ws.dao.theme.php | 7 +++---- inc/ws/Metier/class.ws.theme.php | 2 +- swf/_src/wsComposer.fla | Bin 664064 -> 664064 bytes 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/inc/extranet/Controlleur/class.extranet.core.php b/inc/extranet/Controlleur/class.extranet.core.php index 0f025a917..6ada40178 100644 --- a/inc/extranet/Controlleur/class.extranet.core.php +++ b/inc/extranet/Controlleur/class.extranet.core.php @@ -452,11 +452,10 @@ class extranetCore extends cubeCore { . 'GROUP BY t.categorie,p.annee_fin'); $this->createView('books_vue', 'SELECT b.*,b.proprietaire AS proprietaire_id,c.rs AS proprietaire_nom,c.ws_admin,c.facturable_id,c.facturable ' . 'FROM books b, ws_clients c WHERE b.proprietaire=c.utilisateur_id'); - $this->createView('themes_vue', 'SELECT t.*,GROUP_CONCAT(b.book_id ORDER BY b.book_id ASC) AS books, GROUP_CONCAT(DISTINCT d.utilisateur_id ORDER BY d.utilisateur_id ASC) AS utilisateurs ' + $this->createView('themes_vue', 'SELECT t.*,COUNT(b.book_id) AS nb_books,GROUP_CONCAT(DISTINCT b.book_id ORDER BY b.book_id ASC) AS books ' . 'FROM themes t ' - . 'LEFT JOIN themes_droits d ON t.theme_id=d.theme_id ' . 'LEFT JOIN books b ON t.theme_id=b.theme ' - . 'GROUP BY b.theme, d.theme_id'); + . 'GROUP BY t.theme_id'); // cubeDb::mysqlConvert($this->con); touch($cache); } diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php index e0fdfa587..6f2f133ba 100644 --- a/inc/ws/Controlleur/class.ws.flash.php +++ b/inc/ws/Controlleur/class.ws.flash.php @@ -164,9 +164,8 @@ class wsFlash extends cubeFlashGateway { } else { $right = '-'; } - $t->addAttribute('right', $right); - $t->addAttribute('books', count($theme->books)); - $t->addAttribute('utilisateurs', count($theme->utilisateurs)); + $t->addAttribute('right', rand(0,1)?'w':'r'/*$right*/); + $t->addAttribute('books', $theme->nbBooks); } } diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index c25b876f2..b30cc70fe 100644 --- a/inc/ws/Controlleur/class.ws.url.php +++ b/inc/ws/Controlleur/class.ws.url.php @@ -87,7 +87,7 @@ class wsUrl { http::redirect(SITE_PATH . 'editbook/' . $book->book_id); } - $step = isset($args[2])?$args[2]:1; + /*$step = isset($args[2])?$args[2]:1; $shortcuts = array(); @@ -115,9 +115,9 @@ class wsUrl { } $shortcuts[] = $as . $core->typo->$template($i . '. ' . $n, $class, -1) . $ae; $i++; - } + }*/ - $res = extranetPage::barre(null , null, null, $shortcuts); + $res = extranetPage::barre(null , null, null, null); $res .= extranetPage::tMain(null, true); $res .= extranetPage::bh(); $res .= '
'; diff --git a/inc/ws/DAO/class.ws.dao.theme.php b/inc/ws/DAO/class.ws.dao.theme.php index dc4021e96..463432291 100644 --- a/inc/ws/DAO/class.ws.dao.theme.php +++ b/inc/ws/DAO/class.ws.dao.theme.php @@ -7,8 +7,8 @@ class wsDAOTheme extends extranetDAO { $theme->nom = $r->nom; $theme->date = $r->date; $theme->proprietaire = $r->proprietaire; - $theme->utilisateurs = explode(',', $r->utilisateurs); $theme->books = explode(',', $r->books); + $theme->nbBooks=$r->nb_books; $theme->signature = $r->signature; $theme->icones = $r->icones; $p = unserialize($r->parametres); @@ -30,17 +30,16 @@ class wsDAOTheme extends extranetDAO { public function getThemeOfBook($book_id) { - $r = $this->con->select('SELECT * FROM themes_vue WHERE FIND_IN_SET(\'' . $this->con->escape($book_id) . '\'books) LIMIT 1'); + $r = $this->con->select('SELECT * FROM themes_vue WHERE theme_id IN (SELECT theme FROM books WHERE book_id=\'' . $this->con->escape($book_id) . '\') LIMIT 1'); return $this->singleton($r); } public function getAllThemes($user, $order = '') { - fb($user); if ($user->ws_grade >= 3) { $sql = 'SELECT * FROM themes_vue'; } else if ($user->ws_grade == 2) { - $sql = 'SELECT * FROM themes_vue WHERE FIND_IN_SET(utilisateurs,\'' . $core->con->escape($user->utilisateur_id) . '\')'; + $sql = 'SELECT * FROM themes_vue WHERE theme_id IN (SELECT theme_id FROM themes_droits WHERE utilisateur_id=\'' . $user->utilisateur_id . '\')'; } else { return array(); } diff --git a/inc/ws/Metier/class.ws.theme.php b/inc/ws/Metier/class.ws.theme.php index 71e8fda73..55f95a088 100644 --- a/inc/ws/Metier/class.ws.theme.php +++ b/inc/ws/Metier/class.ws.theme.php @@ -14,8 +14,8 @@ class wsTheme extends cubeMetier { protected $nom; protected $date; protected $parametres; - protected $utilisateurs; protected $books; + protected $nbBooks; } ?> \ No newline at end of file diff --git a/swf/_src/wsComposer.fla b/swf/_src/wsComposer.fla index c811efa8696f122c0913db298e5fc9db00c1de4b..f880a180ca9dc1382900403db92c4580d447e092 100644 GIT binary patch delta 11170 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 Ef1hEVm;e9( -- 2.39.5