(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index bff99cc33e6daddf587412d7f0cf2bef6feae917..2e8216eb16eaa00fbb98f3d06ad6b2549f84550f 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -140,15 +140,30 @@ class wsFlash extends cubeFlashGateway {
        public function getAllThemes()\r
        {\r
                global $core;\r
+\r
+               $dao = new wsDAOBook($core->con);\r
+               $book = $dao->selectById($this->args['book_id']);\r
+\r
                $dao = new wsDAOTheme($core->con);\r
-               $themes = $dao->getAllThemes();\r
+               $themes = $dao->getAllThemes('ORDER BY theme_id DESC');\r
                foreach($themes as $theme) {\r
                        $t = $this->xml->addChild('theme');\r
                        $t->addAttribute('id', $theme->theme_id);\r
                        $t->addAttribute('nom', $theme->nom);\r
+                       if ($theme->theme_id == $book->theme) {\r
+                               $t->addAttribute('selected', '1');\r
+                       }\r
                }\r
        }\r
 \r
+       public function setTheme()\r
+       {\r
+               global $core;\r
+               $dao = new wsDAOBook($core->con);\r
+               $data = array('book_id' => $this->args['book_id'], 'theme' => $this->args['theme']);\r
+               $dao->sauve($core->user->utilisateur_id, $data);\r
+       }\r
+\r
        public function postThemeShot()\r
        {\r
                file_put_contents(ROOT . '/themes/' . $this->args['theme_id'] . '.jpg', base64_decode($this->args['data']));\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 68c83c6076bdee2265156e4ee382abade7944280..0eb872f86e3e33bfd04237e7c0f5cb218b6e428c 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -58,8 +58,8 @@ class wsUrl {
                        $res .= '<td>' . $f . '</td>';\r
                        $res .= '<td>' . $core->books_status[$book->status] . '</td>';\r
                        $res .= '<td class="bouton"><a href="' . SITE_PATH . 'voirbook/' . $book->book_id . '_' . $book->hash . '_' . TIME . '/" class="popupFS">' . cubeMedia::cssRollover($core->typo->Voir('voir', '', false)) . '</a></td>';\r
-                       $res .= '<td class="bouton"><a href="' . SITE_PATH . 'editbook/' . $book->book_id . '">' . cubeMedia::cssRollover($core->typo->Editer('éditer', '', false)) . '</a></td>';\r
-                       $res .= '<td class="bouton"><a href="' . SITE_PATH . 'supprimebook/' . $book->book_id . '">' . cubeMedia::cssRollover($core->typo->Stats('stats', '', false)) . '</a></td>';\r
+                       $res .= '<td class="bouton"><a href="' . SITE_PATH . 'editbook/' . $book->book_id . '/#/composition">' . cubeMedia::cssRollover($core->typo->Editer('éditer', '', false)) . '</a></td>';\r
+                       $res .= '<td class="bouton"><a href="' . SITE_PATH . 'stats/' . $book->book_id . '">' . cubeMedia::cssRollover($core->typo->Stats('stats', '', false)) . '</a></td>';\r
                        $res .= '<td class="bouton"><a href="' . SITE_PATH . 'supprimebook/' . $book->book_id . '">' . cubeMedia::cssRollover($core->typo->Telecharger('télécharger', '', false)) . '</a></td>';\r
                        $res .= '<td class="bouton"><a href="#" rel="supprimeBook/' . $book->book_id . '" class="ajax" title="' . __('Êtes-vous certain de vouloir supprimer cette publication ?') . '">' . cubeMedia::cssRollover($core->typo->Supprimer('suppr.', '', false)) . '</a></td>';\r
                        $res .= '</tr>';\r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 5e4eb1749c975b2019e59f147f6c797c639937e8..f11febee8ed530db3426efef414186a3099a2d8e 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -21,7 +21,7 @@ class wsDAOBook extends extranetDAO {
                $p = unserialize($r->parametres);\r
                if (!$p) {\r
                        $p = new wsBookParametres($book);\r
-               }else{\r
+               } else {\r
                        $p->setParent($book);\r
                }\r
                $book->parametres = $p;\r
@@ -65,13 +65,28 @@ class wsDAOBook extends extranetDAO {
                return $this->singleton($r);\r
        }\r
 \r
+       /**\r
+        * wsDAOBook::sauve()\r
+        *\r
+        * @param mixed $createur\r
+        * @param mixed $data\r
+        * @return\r
+        */\r
        public function sauve($createur, $data)\r
        {\r
                $c = $this->con->openCursor('books');\r
-               $c->nom = $data['nom'];\r
-               $c->lang = $data['lang'];\r
-               $c->theme = $data['theme'];\r
-               $c->proprietaire = $data['proprietaire'];\r
+               if (isset($data['nom'])) {\r
+                       $c->nom = $data['nom'];\r
+               }\r
+               if (isset($data['lang'])) {\r
+                       $c->lang = $data['lang'];\r
+               }\r
+               if (isset($data['theme'])) {\r
+                       $c->theme = $data['theme'];\r
+               }\r
+               if (isset($data['proprietaire'])) {\r
+                       $c->proprietaire = $data['proprietaire'];\r
+               }\r
 \r
                if ($data['book_id'] == 'new' || $data['book_id'] == '') {\r
                        $c->date = TIME;\r
@@ -99,11 +114,10 @@ class wsDAOBook extends extranetDAO {
                $c->status = -1;\r
                $c->date_status = TIME;\r
                $c->parametres = serialize(new wsParametres());\r
-               $c->theme=1;\r
-               $c->lang=1;\r
+               $c->theme = 1;\r
+               $c->lang = 1;\r
                $book_id = $c->book_id = $this->getNextId();\r
                $c->insert();\r
-               fb($book_id);\r
                return $this->selectById($book_id);\r
        }\r
 \r

diff --git a/inc/ws/DAO/class.ws.dao.theme.php b/inc/ws/DAO/class.ws.dao.theme.php
index 4ae1659e3422b89801658d424145a648452e7c83..357d34aa7b6f63bcef9ddee23572513b2466c265 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.theme.php
+++ b/inc/ws/DAO/class.ws.dao.theme.php
@@ -32,9 +32,9 @@ class wsDAOTheme extends extranetDAO {
                return $this->singleton($r);\r
        }\r
 \r
-       public function getAllThemes()\r
+       public function getAllThemes($order='')\r
        {\r
-               $r = $this->con->select('SELECT * FROM themes');\r
+               $r = $this->con->select('SELECT * FROM themes '.$order);\r
                return $this->factory($r);\r
        }\r
 }\r