Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 17:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

New: Add cancel button on note edit

Browse Source
This commit is contained in:
Laurent Destailleur
2011-07-13 16:24:57 +00:00
parent cf184ec351
commit adbff7bc50
1 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
htdocs/societe/socnote.php
View File

@@ -23,7 +23,7 @@
* \file htdocs/societe/socnote.php
* \brief Tab for notes on third party
* \ingroup societe
* \version $Id$
* \version $Id: socnote.php,v 1.22 2011/07/13 16:24:57 eldy Exp $
*/
require("../main.inc.php");
@@ -44,13 +44,13 @@ $result = restrictedArea($user, 'societe', $socid);
* Actions
*/
if ($action == 'add')
if ($action == 'add' && ! GETPOST('cancel'))
{
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"];
$result = $db->query($sql);
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"];
$result = $db->query($sql);
$_GET["socid"]=$_POST["socid"]; // Pour retour sur fiche
$socid = $_GET["socid"];
$_GET["socid"]=$_POST["socid"]; // Pour retour sur fiche
$socid = $_GET["socid"];
}
@@ -70,25 +70,25 @@ if ($socid > 0)
$societe = new Societe($db, $socid);
$societe->fetch($socid);
/*
* Affichage onglets
*/
/*
* Affichage onglets
*/
if ($conf->notification->enabled) $langs->load("mails");
$head = societe_prepare_head($societe);
$head = societe_prepare_head($societe);
dol_fiche_head($head, 'note', $langs->trans("ThirdParty"),0,'company');
dol_fiche_head($head, 'note', $langs->trans("ThirdParty"),0,'company');
print "<form method=\"post\" action=\"".DOL_URL_ROOT."/societe/socnote.php\">";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print "<form method=\"post\" action=\"".DOL_URL_ROOT."/societe/socnote.php\">";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table class="border" width="100%">';
print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
print '<td colspan="3">';
print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom');
print '</td></tr>';
print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
print '<td colspan="3">';
print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom');
print '</td></tr>';
if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
{
@@ -113,32 +113,36 @@ if ($socid > 0)
print '</td></tr>';
}
print '<tr><td valign="top">'.$langs->trans("Note").'</td>';
print '<td valign="top">';
if ($action == 'edit' && $user->rights->societe->creer)
{
print "<input type=\"hidden\" name=\"action\" value=\"add\">";
print "<input type=\"hidden\" name=\"socid\" value=\"".$societe->id."\">";
print '<tr><td valign="top">'.$langs->trans("Note").'</td>';
print '<td valign="top">';
if ($action == 'edit' && $user->rights->societe->creer)
{
print "<input type=\"hidden\" name=\"action\" value=\"add\">";
print "<input type=\"hidden\" name=\"socid\" value=\"".$societe->id."\">";
// Editeur wysiwyg
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
$doleditor=new DolEditor('note',$societe->note,'',360,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70);
$doleditor->Create();
}
else
{
print dol_textishtml($societe->note)?$societe->note:dol_nl2br($societe->note,1,true);
}
print "</td></tr>";
// Editeur wysiwyg
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
$doleditor=new DolEditor('note',$societe->note,'',360,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70);
$doleditor->Create();
}
else
{
print dol_textishtml($societe->note)?$societe->note:dol_nl2br($societe->note,1,true);
}
print "</td></tr>";
if ($action == 'edit')
{
print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td></tr>';
}
if ($action == 'edit')
{
print '<tr><td colspan="2" align="center">';
print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
print ' &nbsp; ';
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
print '</td></tr>';
}
print "</table>";
print "</table>";
print '</form>';
print '</form>';
}
print '</div>';
@@ -163,5 +167,5 @@ if ($action != 'edit')
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/07/13 16:24:57 $ - $Revision: 1.22 $');
?>