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

Fix: Error management if javascript disabled.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-08-19 20:36:01 +00:00
parent 8fa175f3e9
commit 665aefe75e
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/photos_resize.php
View File

@ -152,6 +152,9 @@ print '<br></form>';
print '<br>'."\n"; print '<br>'."\n";
if (! empty($conf->use_javascript_ajax))
{
$infoarray=dol_getImageSize($conf->product->dir_output."/".urldecode($_GET["file"])); $infoarray=dol_getImageSize($conf->product->dir_output."/".urldecode($_GET["file"]));
$height=$infoarray['height']; $height=$infoarray['height'];
$width=$infoarray['width']; $width=$infoarray['width'];
@ -182,5 +185,8 @@ print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$_GET['id'].'" method="post"
</form>'; </form>';
print '</fieldset>'; print '</fieldset>';
}
llxFooter('$Date$ - $Revision$'); llxFooter('$Date$ - $Revision$');
?> ?>

27
htdocs/projet/ganttview.php
View File

@ -65,11 +65,13 @@ $arrayofcss=array(
'/includes/jsgantt/jsgantt.css' '/includes/jsgantt/jsgantt.css'
); );
$arrayofjs=array( if (! empty($conf->use_javascript_ajax))
'/includes/jsgantt/jsgantt.js', {
'/projet/jsgantt_language.js.php?lang='.$langs->defaultlang $arrayofjs=array(
); '/includes/jsgantt/jsgantt.js',
'/projet/jsgantt_language.js.php?lang='.$langs->defaultlang
);
}
$form=new Form($db); $form=new Form($db);
$formother=new FormOther($db); $formother=new FormOther($db);
@ -236,9 +238,18 @@ if (sizeof($tasksarray)>0)
//var_dump($tasks); //var_dump($tasks);
print "\n"; print "\n";
print '<div id="tabs" style="border: 1px solid #ACACAC;">'."\n";
include_once(DOL_DOCUMENT_ROOT.'/projet/ganttchart.php'); if (! empty($conf->use_javascript_ajax))
print '</div>'."\n"; {
print '<div id="tabs" style="border: 1px solid #ACACAC;">'."\n";
include_once(DOL_DOCUMENT_ROOT.'/projet/ganttchart.php');
print '</div>'."\n";
}
else
{
$langs->load("admin");
print $langs->trans("AvailableOnlyIfJavascriptAndAjaxNotDisabled");
}
} }
else else
{ {