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

Qual: Fix architecture problem with canvas

Browse Source
This commit is contained in:
Laurent Destailleur 2011-04-06 16:21:46 +00:00
parent d72f417868
commit c311bf5f2c
2 changed files with 54 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/contact/fiche.php
View File

@ -320,15 +320,25 @@ if (! empty($objcanvas->template_dir))
} }
else else
{ {
$result=$objcanvas->fetch($id); // Reload object // Fetch object
$objcanvas->assign_values('view'); // Assign values $result=$objcanvas->fetch($id);
$objcanvas->display_canvas('view'); // Show template if ($result > 0)
{
// Assign values
$objcanvas->assign_values('view');
// Display canvas
$objcanvas->display_canvas('view');
// TODO Move this also into template
print show_actions_todo($conf,$langs,$db,$objsoc,$objcanvas->control->object); print show_actions_todo($conf,$langs,$db,$objsoc,$objcanvas->control->object);
print show_actions_done($conf,$langs,$db,$objsoc,$objcanvas->control->object); print show_actions_done($conf,$langs,$db,$objsoc,$objcanvas->control->object);
} }
else
{
dol_htmloutput_errors($objcanvas->error,$objcanvas->errors);
}
}
} }
else else

20
htdocs/societe/soc.php
View File

@ -397,11 +397,17 @@ if (! empty($objcanvas->template_dir))
} }
else else
{ {
$result=$objcanvas->fetch($socid); // Relaod object // Fetch object
$objcanvas->assign_values('view'); // Assign values $result=$objcanvas->fetch($socid);
$objcanvas->display_canvas('view'); // Show template if ($result > 0)
{
// Assign values
$objcanvas->assign_values('view');
// Display canvas
$objcanvas->display_canvas('view');
// TODO Move this also into template
print '<table width="100%"><tr><td valign="top" width="50%">'; print '<table width="100%"><tr><td valign="top" width="50%">';
print '<a name="builddoc"></a>'; // ancre print '<a name="builddoc"></a>'; // ancre
@ -433,6 +439,12 @@ if (! empty($objcanvas->template_dir))
// Projects list // Projects list
$result=show_projects($conf,$langs,$db,$objcanvas->control->object); $result=show_projects($conf,$langs,$db,$objcanvas->control->object);
} }
else
{
dol_htmloutput_errors($objcanvas->error,$objcanvas->errors);
}
}
} }
else else
{ {