Fix: Le contenu du mail de validation pour un type d'adhérent n'apparait pas en modif.
This commit is contained in:
parent
3b8af02f81
commit
2368182243
@ -41,17 +41,18 @@ class AdherentType
|
|||||||
var $libelle;
|
var $libelle;
|
||||||
var $statut;
|
var $statut;
|
||||||
var $cotisation; /**< Soumis à la cotisation */
|
var $cotisation; /**< Soumis à la cotisation */
|
||||||
var $error;
|
|
||||||
var $mail_valid; /**< mail envoye lors de la validation */
|
|
||||||
var $commentaire; /**< commentaire */
|
|
||||||
var $vote; /** droit de vote ? */
|
var $vote; /** droit de vote ? */
|
||||||
|
var $commentaire; /**< commentaire */
|
||||||
|
var $mail_valid; /**< mail envoye lors de la validation */
|
||||||
|
|
||||||
|
var $error;
|
||||||
|
var $db;
|
||||||
|
|
||||||
/**
|
|
||||||
\brief AdherentType
|
/**
|
||||||
\param DB handler accès base de données
|
\brief AdherentType
|
||||||
*/
|
\param DB handler accès base de données
|
||||||
|
*/
|
||||||
function AdherentType($DB)
|
function AdherentType($DB)
|
||||||
{
|
{
|
||||||
$this->db = $DB ;
|
$this->db = $DB ;
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||||
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
|
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
|
||||||
* Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
|
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -38,7 +38,9 @@ $user->getrights('adherent');
|
|||||||
$rowid=isset($_GET["rowid"])?$_GET["rowid"]:$_POST["rowid"];
|
$rowid=isset($_GET["rowid"])?$_GET["rowid"]:$_POST["rowid"];
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Actions
|
||||||
|
*/
|
||||||
if ($_POST["action"] == 'add')
|
if ($_POST["action"] == 'add')
|
||||||
{
|
{
|
||||||
if (! $user->rights->adherent->configurer) accessforbidden();
|
if (! $user->rights->adherent->configurer) accessforbidden();
|
||||||
@ -109,8 +111,6 @@ if ($_GET["action"] == 'commentaire')
|
|||||||
|
|
||||||
llxHeader();
|
llxHeader();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
/* */
|
/* */
|
||||||
/* Liste des types d'adhérents */
|
/* Liste des types d'adhérents */
|
||||||
@ -187,8 +187,6 @@ if (! $rowid && $_GET["action"] != 'create' && $_GET["action"] != 'edit')
|
|||||||
/* Création d'un type adherent */
|
/* Création d'un type adherent */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
|
||||||
if ($_GET["action"] == 'create')
|
if ($_GET["action"] == 'create')
|
||||||
{
|
{
|
||||||
$htmls = new Form($db);
|
$htmls = new Form($db);
|
||||||
@ -335,16 +333,16 @@ if ($rowid > 0)
|
|||||||
if ($conf->fckeditor->enabled)
|
if ($conf->fckeditor->enabled)
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
|
||||||
$doleditor=new DolEditor('mail_valid','',280,'dolibarr_notes','',false);
|
$doleditor=new DolEditor('mail_valid',$adht->mail_valid,280,'dolibarr_notes','',false);
|
||||||
$doleditor->Create();
|
$doleditor->Create();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print '<textarea class="flat" name="mail_valid" rows="15" cols="90">';
|
print '<textarea class="flat" name="mail_valid" rows="15" cols="90">';
|
||||||
|
print $adht->mail_valid;
|
||||||
print '</textarea>';
|
print '</textarea>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
print "</td></tr>";
|
print "</td></tr>";
|
||||||
|
|
||||||
print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"> ';
|
print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"> ';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user