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

Fix cancel button

Browse Source
This commit is contained in:
Laurent Destailleur 2017-11-22 11:54:02 +01:00
parent d2b3fc5813
commit aa91b9075a
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/class/commonobject.class.php
View File

@ -50,7 +50,6 @@ abstract class CommonObject
public $id; public $id;
/** /**
* @var string Error string * @var string Error string
* @deprecated Use instead the array of error strings
* @see errors * @see errors
*/ */
public $error; public $error;

37
htdocs/resource/card.php
View File

@ -67,6 +67,12 @@ $extrafields = new ExtraFields($db);
// fetch optionals attributes and labels // fetch optionals attributes and labels
$extralabels=$extrafields->fetch_name_optionals_label($object->table_element); $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
/*******************************************************************
* ACTIONS
********************************************************************/
$hookmanager->initHooks(array('resource', 'resource_card','globalcard')); $hookmanager->initHooks(array('resource', 'resource_card','globalcard'));
$parameters=array('resource_id'=>$id); $parameters=array('resource_id'=>$id);
$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
@ -74,9 +80,21 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
if (empty($reshook)) if (empty($reshook))
{ {
/******************************************************************* if ($cancel)
* ACTIONS {
********************************************************************/ if (! empty($backtopage))
{
header("Location: ".$backtopage);
exit;
}
if ($action == 'add')
{
header("Location: ".DOL_URL_ROOT.'/resource/list.php');
exit;
}
$action='';
}
if ($action == 'add' && $user->rights->resource->write) if ($action == 'add' && $user->rights->resource->write)
{ {
if (! $cancel) if (! $cancel)
@ -203,7 +221,7 @@ if (empty($reshook))
* *
* Put here all code to build page * Put here all code to build page
****************************************************/ ****************************************************/
$title = $langs->trans($action == 'create' ? 'AddResource' : 'ResourceCard'); $title = $langs->trans($action == 'create' ? 'AddResource' : 'ResourceSingular');
llxHeader('',$title,''); llxHeader('',$title,'');
$form = new Form($db); $form = new Form($db);
@ -227,9 +245,8 @@ if ($action == 'create' || $object->fetch($id) > 0)
if ( ! $user->rights->resource->write ) if ( ! $user->rights->resource->write )
accessforbidden('',0); accessforbidden('',0);
/*--------------------------------------- // Create/Edit object
* Create/Edit object
*/
print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="POST">'; print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="'.($action == "create"?"add":"update").'">'; print '<input type="hidden" name="action" value="'.($action == "create"?"add":"update").'">';
@ -268,9 +285,9 @@ if ($action == 'create' || $object->fetch($id) > 0)
dol_fiche_end(); dol_fiche_end();
print '<div class="center">'; print '<div class="center">';
print '<input type="submit" class="button" value="' . $langs->trans($action == "create"?"Create":"Modify") . '">'; print '<input type="submit" class="button" name="save" value="' . $langs->trans($action == "create"?"Create":"Modify") . '">';
print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'; print ' &nbsp; &nbsp; ';
print '<input type="submit" class="button" value="' . $langs->trans("Cancel") . '">'; print '<input type="submit" class="button" name="cancel" value="' . $langs->trans("Cancel") . '">';
print '</div>'; print '</div>';
print '</div>'; print '</div>';