composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 07:12:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bugs linked to the bookmark creation:

Browse Source 
- There must be a user specific menu entry in the list of menuNodes
- The asynchronous ajax page must use the authentication stored in the session
- The query must be stored in OQL instead of sibusQL

SVN:code[58]
This commit is contained in:
Denis Flaven
2009-04-28 13:24:12 +00:00
parent 5ca45d7a82
commit 0126c1322e
4 changed files with 55 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
trunk/pages/UniversalSearch.php
View File

@@ -58,14 +58,14 @@ if ($oFilter != null)
$oResultBlock->RenderContent($oP);
// Menu node
$sFilter = $oFilter->ToSibusQL();
$sFilter = $oFilter->ToOQL();
$sMenuNodeContent = <<<EOF
<div id="TopPane">
<itopblock BlockClass="DisplayBlock" objectclass="bizContact" type="search" asynchronous="false" encoding="text/sibusql">$sFilter</itopblock>
<itopblock BlockClass="DisplayBlock" type="search" asynchronous="false" encoding="text/oql">$sFilter</itopblock>
</div>
<div id="BottomPane">
<p></p>
<itopblock BlockClass="DisplayBlock" objectclass="bizContact" type="list" asynchronous="false" encoding="text/sibusql">$sFilter</itopblock>
<itopblock BlockClass="DisplayBlock" type="list" asynchronous="false" encoding="text/oql">$sFilter</itopblock>
</div>
EOF;

12
trunk/pages/ajax.render.php
View File

@@ -6,10 +6,18 @@ require_once('../application/wizardhelper.class.inc.php');
require_once('../application/ui.linkswidget.class.inc.php');
require_once('../application/startup.inc.php');
if (isset($_SERVER['PHP_AUTH_USER']))
session_start();
if (isset($_SESSION['auth_user']))
{
$sAuthUser = $_SESSION['auth_user'];
$sAuthPwd = $_SESSION['auth_pwd'];
// Attempt to login, fails silently
UserRights::Login($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
UserRights::Login($sAuthUser, $sAuthPwd);
}
else
{
// No session information
echo "<p>No session information</p>\n";
}
$oPage = new ajax_page("");