From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 12 Nov 2010 16:50:01 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=fe003dd8a859cfe152c25b70a287eb43533a64ca;p=cubeextranet.git

---

diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index b9250e711..c527ab4db 100644
--- 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) {
 				$suggestions[] = $book->book_id . ' - ' . $book->nom;
 			}
+		}elseif($args[1]=='wsuser'){
+			$dao = new extranetDAOClient($core->con);
+			$dao->setSearch($q, true);
+			$clients = $dao->getListe();
+			foreach($clients as $client) {
+				$suggestions[] = $client->utilisateur_id . ' - ' . $client->rs . ' (' . $client->prenom . ' ' . $client->nom . ')';
+			}
 		}
 		cubeSearch::searchSuggestion($args[2], $suggestions);
 		exit;
diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 0627acbb3..fc0cd4f4e 100644
--- 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);
 	}
 
-	public static function changeBookProprietaire($args, &$x)
+	public static function formChangeBookProprietaire($args, &$x)
 	{
-		extranetAjax::form('changeBookProprietaire', __("Modifier le propriétaire de la publication"), wsUrl::changeBookProprietaire($args[1]), __('Enregistrer'), 3);
+		extranetAjax::form('changeBookProprietaire/' . $args[1], __("Modifier le propriétaire de la publication"), wsUrl::changeBookProprietaire($args[1]), __('Enregistrer'), 3);
 	}
 
 	public static function filtreBooks($args, &$x)
@@ -67,6 +67,20 @@ class wsAjax extends cubeAjax {
 		$x->addContent('listeBooks', wsUrl::listeBooks());
 		$x->addTruePopup(SITE_PATH . 'editbook/' . $book->book_id);
 	}
+
+	public static function changeBookProprietaire($args, &$x)
+	{
+		global $core;
+		if ($_POST['proprietaire'] == '') {
+			$x->addError('book_proprietaire');
+			return;
+		}
+		$x->addOk('book_proprietaire');
+		$dao = new wsDAOBook($core->con);
+		$dao->setProprietaire($args[1],$_POST['proprietaire']);
+		$x->addClosePopup();
+		$x->addContent('listeBooks', wsUrl::listeBooks());
+	}
 }
 
 ?>
\ 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 5eb097996..fc9bdf678 100644
--- 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>';
 			$res .= '<td>' . $book->nom . '</td>';
 			$res .= '<td>' . mb_strtoupper($book->lang) . '</td>';
-			$res .= '<td><a href="#" class="popup" rel="changeBookProprietaire/' . $book->book_id . '" title="' . __('Mofifier le proprietaire') . '">' . $book->proprietaire . '</a></td>';
+			$res .= '<td><a href="#" class="popup" rel="formChangeBookProprietaire/' . $book->book_id . '" title="' . __('Mofifier le proprietaire') . '">' . $book->proprietaire . '</a></td>';
 			// $f = $book->facturable;
 			$res .= '<td>' ./* $f .*/ '</td>';
 			$res .= '<td>' . $core->books_status[$book->status] . '</td>';
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 793248692..3491178ea 100644
--- 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) . '\'');
 	}
 
+	public function setProprietaire($book_id, $proprietaire_id)
+	{
+		$c = $this->con->openCursor('books');
+		$c->proprietaire = $proprietaire_id;
+		$c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');
+	}
+
 	public function setComposition($book_id, $pages)
 	{
 		$numerotation = array();
diff --git a/js/ws.js b/js/ws.js
index 4a265c473..a4fb45ea5 100644
--- a/js/ws.js
+++ b/js/ws.js
@@ -11,12 +11,32 @@ function load_ws(){
 		});
 	}
 
-	function findBook(li){
-		var book=li.selectValue.split(' - ');
-		if(book.length<=1){
-			return;
-		}
-		var book_id=parseInt(book[0]);
-		$("#book").val(book_id);
+	if($("#book_proprietaire").length){
+		$("#book_proprietaire").autocomplete(SITE_PATH+'autocomplete/wsuser',{
+			cacheLength		:	0,
+			maxItemsToShow	:	15,
+			onFindValue		: 	findProprietaire,
+			onItemSelect	: 	findProprietaire
+		});
+	}
+
+
+}
+
+function findProprietaire(li){
+	var p=li.selectValue.split(' - ');
+	if(p.length<=1){
+		return;
+	}
+	var user_id=parseInt(p[0]);
+	$("#proprietaire").val(user_id);
+}
+
+function findBook(li){
+	var book=li.selectValue.split(' - ');
+	if(book.length<=1){
+		return;
 	}
+	var book_id=parseInt(book[0]);
+	$("#book").val(book_id);
 }
\ No newline at end of file