(no commit message)

diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index b9250e7111a36857dfa088368fd7e212fff98e8e..c527ab4db1267ab9e02f2fbd3b33f7551c90813e 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.url.php
+++ b/inc/extranet/Controlleur/class.extranet.url.php
@@ -1782,6 +1782,13 @@ class extranetUrl {
                        foreach($books as $book) {\r
                                $suggestions[] = $book->book_id . ' - ' . $book->nom;\r
                        }\r
+               }elseif($args[1]=='wsuser'){\r
+                       $dao = new extranetDAOClient($core->con);\r
+                       $dao->setSearch($q, true);\r
+                       $clients = $dao->getListe();\r
+                       foreach($clients as $client) {\r
+                               $suggestions[] = $client->utilisateur_id . ' - ' . $client->rs . ' (' . $client->prenom . ' ' . $client->nom . ')';\r
+                       }\r
                }\r
                cubeSearch::searchSuggestion($args[2], $suggestions);\r
                exit;\r

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 0627acbb3e7a4ef23fb3f4fb78daa74464a387b8..fc0cd4f4efa070c68f3e118c24920c0606efcd54 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -37,9 +37,9 @@ class wsAjax extends cubeAjax {
                extranetAjax::form('newBook', __("Créer une nouvelle publication à partir d'une existante"), wsUrl::chooseExistingBook(), __('Créer une nouvelle publication'), 3);\r
        }\r
 \r
-       public static function changeBookProprietaire($args, &$x)\r
+       public static function formChangeBookProprietaire($args, &$x)\r
        {\r
-               extranetAjax::form('changeBookProprietaire', __("Modifier le propriétaire de la publication"), wsUrl::changeBookProprietaire($args[1]), __('Enregistrer'), 3);\r
+               extranetAjax::form('changeBookProprietaire/' . $args[1], __("Modifier le propriétaire de la publication"), wsUrl::changeBookProprietaire($args[1]), __('Enregistrer'), 3);\r
        }\r
 \r
        public static function filtreBooks($args, &$x)\r
@@ -67,6 +67,20 @@ class wsAjax extends cubeAjax {
                $x->addContent('listeBooks', wsUrl::listeBooks());\r
                $x->addTruePopup(SITE_PATH . 'editbook/' . $book->book_id);\r
        }\r
+\r
+       public static function changeBookProprietaire($args, &$x)\r
+       {\r
+               global $core;\r
+               if ($_POST['proprietaire'] == '') {\r
+                       $x->addError('book_proprietaire');\r
+                       return;\r
+               }\r
+               $x->addOk('book_proprietaire');\r
+               $dao = new wsDAOBook($core->con);\r
+               $dao->setProprietaire($args[1],$_POST['proprietaire']);\r
+               $x->addClosePopup();\r
+               $x->addContent('listeBooks', wsUrl::listeBooks());\r
+       }\r
 }\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 5eb097996729ed6515996af4e50e6def1e1ceab3..fc9bdf678670eebceaefc83d916df37151deef49 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -61,7 +61,7 @@ class wsUrl {
                        $res .= '<td>' . $book->book_id . '</td>';\r
                        $res .= '<td>' . $book->nom . '</td>';\r
                        $res .= '<td>' . mb_strtoupper($book->lang) . '</td>';\r
-                       $res .= '<td><a href="#" class="popup" rel="changeBookProprietaire/' . $book->book_id . '" title="' . __('Mofifier le proprietaire') . '">' . $book->proprietaire . '</a></td>';\r
+                       $res .= '<td><a href="#" class="popup" rel="formChangeBookProprietaire/' . $book->book_id . '" title="' . __('Mofifier le proprietaire') . '">' . $book->proprietaire . '</a></td>';\r
                        // $f = $book->facturable;\r
                        $res .= '<td>' ./* $f .*/ '</td>';\r
                        $res .= '<td>' . $core->books_status[$book->status] . '</td>';\r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 7932486921fa5f0bc5b156c15047058cebd06853..3491178ea4ef99786b217a933a35218688922eb2 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -323,6 +323,13 @@ class wsDAOBook extends extranetDAO {
                $c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');\r
        }\r
 \r
+       public function setProprietaire($book_id, $proprietaire_id)\r
+       {\r
+               $c = $this->con->openCursor('books');\r
+               $c->proprietaire = $proprietaire_id;\r
+               $c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');\r
+       }\r
+\r
        public function setComposition($book_id, $pages)\r
        {\r
                $numerotation = array();\r

diff --git a/js/ws.js b/js/ws.js
index 4a265c473425f0ef2a78b3087076a8797ddc1ad5..a4fb45ea51a7652236667220d06e233265180da4 100644 (file)
--- a/js/ws.js
+++ b/js/ws.js
@@ -11,12 +11,32 @@ function load_ws(){
                });\r
        }\r
 \r
-       function findBook(li){\r
-               var book=li.selectValue.split(' - ');\r
-               if(book.length<=1){\r
-                       return;\r
-               }\r
-               var book_id=parseInt(book[0]);\r
-               $("#book").val(book_id);\r
+       if($("#book_proprietaire").length){\r
+               $("#book_proprietaire").autocomplete(SITE_PATH+'autocomplete/wsuser',{\r
+                       cacheLength             :       0,\r
+                       maxItemsToShow  :       15,\r
+                       onFindValue             :       findProprietaire,\r
+                       onItemSelect    :       findProprietaire\r
+               });\r
+       }\r
+\r
+\r
+}\r
+\r
+function findProprietaire(li){\r
+       var p=li.selectValue.split(' - ');\r
+       if(p.length<=1){\r
+               return;\r
+       }\r
+       var user_id=parseInt(p[0]);\r
+       $("#proprietaire").val(user_id);\r
+}\r
+\r
+function findBook(li){\r
+       var book=li.selectValue.split(' - ');\r
+       if(book.length<=1){\r
+               return;\r
        }\r
+       var book_id=parseInt(book[0]);\r
+       $("#book").val(book_id);\r
 }
\ No newline at end of file