From 05ed583cf15eb96ce13409e54ace3c6a0af66c19 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 4 Nov 2010 17:50:01 +0000 Subject: [PATCH] Works on contact canvas in relation to the thirdparty canvas module --- .../actions_contactcard_common.class.php | 6 ++--- .../actions_contactcard_default.class.php | 22 +++++++++---------- .../default/tpl/contactcard_view.tpl.php | 2 ++ htdocs/contact/fiche.php | 12 ---------- .../canvas/default/tpl/card_view.tpl.php | 4 ---- .../canvas/individual/tpl/card_view.tpl.php | 4 ---- 6 files changed, 15 insertions(+), 35 deletions(-) diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php index 56083af638f..6e60c308144 100644 --- a/htdocs/contact/canvas/actions_contactcard_common.class.php +++ b/htdocs/contact/canvas/actions_contactcard_common.class.php @@ -181,7 +181,7 @@ class ActionsContactCardCommon if ($action == 'view') { - $this->tpl['showrefnav'] = $form->showrefnav($this->object,'id'); + $this->tpl['showrefnav'] = $form->showrefnav($this->object,'id'); if ($this->object->socid > 0) { @@ -207,8 +207,8 @@ class ActionsContactCardCommon $this->tpl['phone_pro'] = dol_print_phone($this->object->phone_pro,$this->object->pays_code,0,$this->object->id,'AC_TEL'); $this->tpl['phone_perso'] = dol_print_phone($this->object->phone_perso,$this->object->pays_code,0,$this->object->id,'AC_TEL'); $this->tpl['phone_mobile'] = dol_print_phone($this->object->phone_mobile,$this->object->pays_code,0,$this->object->id,'AC_TEL'); - $this->tpl['fax'] = dol_print_phone($this->object->fax,$this->object->pays_code,0,$this->object->id,'AC_FAX'); - $this->tpl['email'] = dol_print_email($this->object->email,0,$this->object->id,'AC_EMAIL'); + $this->tpl['fax'] = dol_print_phone($this->object->fax,$this->object->pays_code,0,$this->object->id,'AC_FAX'); + $this->tpl['email'] = dol_print_email($this->object->email,0,$this->object->id,'AC_EMAIL'); $this->tpl['visibility'] = $this->object->LibPubPriv($this->object->priv); diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php index 4ff7090c53b..132c71b7139 100644 --- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php +++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php @@ -84,23 +84,21 @@ class ActionsContactCardDefault extends ActionsContactCardCommon */ function assign_values($action='') { - global $conf, $langs, $user, $mysoc; - global $form, $formadmin, $formcompany; + global $langs, $user; + global $form; parent::assign_values($action); - if ($action == 'create' || $action == 'edit') - { - - } - if ($action == 'view') { - // Confirm delete third party - if ($_GET["action"] == 'delete') - { - $this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$this->object->id,$langs->trans("DeleteACompany"),$langs->trans("ConfirmDeleteCompany"),"confirm_delete",'',0,2); - } + // Confirm delete contact + if ($user->rights->societe->contact->supprimer) + { + if ($_GET["action"] == 'delete') + { + $this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id,$langs->trans("DeleteContact"),$langs->trans("ConfirmDeleteContact"),"confirm_delete",'',0,1); + } + } } } diff --git a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php index 28c0360b775..8c1c10a81fa 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php @@ -21,6 +21,8 @@ +control->tpl['action_delete']) echo $this->control->tpl['action_delete']; ?> + diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 8e768f47446..56898d93f15 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -249,18 +249,6 @@ if (! empty($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 '
'; - } - } - if (GETPOST("action") == 'create') { // Set action type diff --git a/htdocs/societe/canvas/default/tpl/card_view.tpl.php b/htdocs/societe/canvas/default/tpl/card_view.tpl.php index d9e7d3ccb34..5fa70007d81 100644 --- a/htdocs/societe/canvas/default/tpl/card_view.tpl.php +++ b/htdocs/societe/canvas/default/tpl/card_view.tpl.php @@ -23,10 +23,6 @@ control->tpl['action_delete']) echo $this->control->tpl['action_delete']; ?> - -
- - diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php index f1c10e823b3..c22e7624c72 100644 --- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php +++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php @@ -23,10 +23,6 @@ control->tpl['action_delete']) echo $this->control->tpl['action_delete']; ?> - -
- -