lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Works on contact canvas in relation to the thirdparty canvas module

Browse Source
This commit is contained in:
Regis Houssin 2010-11-03 15:56:57 +00:00
parent 9d82ea9a69
commit 06f2288904
2 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/contact/canvas/actions_contactcard_common.class.php
View File

@ -265,6 +265,8 @@ class ActionsContactCardCommon
{ {
global $conf, $user, $langs; global $conf, $user, $langs;
$errors='';
// Creation utilisateur depuis contact // Creation utilisateur depuis contact
if (GETPOST("action") == 'confirm_create_user' && GETPOST("confirm") == 'yes' && $user->rights->user->user->creer) if (GETPOST("action") == 'confirm_create_user' && GETPOST("confirm") == 'yes' && $user->rights->user->user->creer)
{ {
@ -279,13 +281,15 @@ class ActionsContactCardCommon
if ($result < 0) if ($result < 0)
{ {
$msg=$nuser->error; $errors=$nuser->error;
} }
} }
else else
{ {
$msg=$object->error; $errors=$this->object->error;
} }
return $errors;
} }
// Creation contact // Creation contact
@ -313,6 +317,8 @@ class ActionsContactCardCommon
$_GET["action"] = $_POST["action"] = 'create'; $_GET["action"] = $_POST["action"] = 'create';
} }
} }
return $errors;
} }
if (GETPOST("action") == 'confirm_delete' && GETPOST("confirm") == 'yes' && $user->rights->societe->contact->supprimer) if (GETPOST("action") == 'confirm_delete' && GETPOST("confirm") == 'yes' && $user->rights->societe->contact->supprimer)
@ -330,8 +336,10 @@ class ActionsContactCardCommon
} }
else else
{ {
$mesg=$this->object->error; $errors=$this->object->error;
} }
return $errors;
} }
if ($_POST["action"] == 'update' && ! $_POST["cancel"] && $user->rights->societe->contact->creer) if ($_POST["action"] == 'update' && ! $_POST["cancel"] && $user->rights->societe->contact->creer)
@ -360,9 +368,11 @@ class ActionsContactCardCommon
} }
else else
{ {
$mesg=$this->object->error; $errors=$this->object->error;
} }
} }
return $errors;
} }
} }

31
htdocs/contact/fiche.php
View File

@ -80,7 +80,7 @@ if (! empty($canvas))
// ----------------------------------------- // -----------------------------------------
// Load data control // Load data control
$objcanvas->doActions($id); $msg = $objcanvas->doActions($id);
} }
else else
{ {
@ -249,6 +249,18 @@ if (! empty($canvas))
// When used with CANVAS // When used with CANVAS
// ----------------------------------------- // -----------------------------------------
/*
* Confirmation de la suppression du contact
*/
if ($user->rights->societe->contact->supprimer)
{
if ($_GET["action"] == 'delete')
{
$ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$_GET["id"],$langs->trans("DeleteContact"),$langs->trans("ConfirmDeleteContact"),"confirm_delete",'',0,1);
if ($ret == 'html') print '<br>';
}
}
if ($user->rights->societe->contact->creer) if ($user->rights->societe->contact->creer)
{ {
if (GETPOST("action") == 'create') if (GETPOST("action") == 'create')
@ -313,6 +325,23 @@ if (! empty($canvas))
{ {
// Set action type // Set action type
$objcanvas->setAction('view'); $objcanvas->setAction('view');
if ($msg)
{
$langs->load("errors");
print '<div class="error">'.$langs->trans($msg).'</div>';
}
if ($_GET["action"] == 'create_user')
{
$login=strtolower(substr($object->prenom, 0, 4)) . strtolower(substr($object->nom, 0, 4));
// Create a form array
$formquestion=array(array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login));
$ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("CreateDolibarrLogin"),$langs->trans("ConfirmCreateContact"),"confirm_create_user",$formquestion);
if ($ret == 'html') print '<br>';
}
// Fetch object // Fetch object
$result=$objcanvas->fetch($id); $result=$objcanvas->fetch($id);