composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: broken context usage when no context (neither org nor menu) at all

Browse Source 
SVN:trunk[1381]
This commit is contained in:
Denis Flaven
2011-07-28 15:12:16 +00:00
parent c7e27a836a
commit d50f812694
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/itopwebpage.class.inc.php
View File

@@ -398,8 +398,9 @@ EOF
{ {
return sURL+'?'+sContext; return sURL+'?'+sContext;
} }
return sURL+'&'+sContext;
} }
return sURL+'&'+sContext; return sURL;
} }
var oUserPreferences = $sUserPrefs; var oUserPreferences = $sUserPrefs;

10
application/portalwebpage.class.inc.php
View File

@@ -158,8 +158,7 @@ EOF
{ {
return '$sAbsURLAppRoot'; return '$sAbsURLAppRoot';
} }
function AddAppContext(sURL) function AddAppContext(sURL)
{ {
var sContext = '$sAppContext'; var sContext = '$sAppContext';
@@ -168,11 +167,12 @@ EOF
if (sURL.indexOf('?') == -1) if (sURL.indexOf('?') == -1)
{ {
return sURL+'?'+sContext; return sURL+'?'+sContext;
} }
return sURL+'&'+sContext;
} }
return sURL+'&'+sContext; return sURL;
} }
function GoBack(sFormId) function GoBack(sFormId)
{ {
var form = $('#'+sFormId); var form = $('#'+sFormId);