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

(Retrofit from trunk) Portal : Added Location scope to standard portal configuration because of the implementation of r4380

Browse Source 
SVN:2.3[4383]
This commit is contained in:
Guillaume Lajarige
2016-09-06 09:31:17 +00:00
parent 096236cb3a
commit 899045dece
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php
View File

@@ -540,7 +540,7 @@ class ObjectFormManager extends FormManager
$oScopeSearch = $this->oApp['scope_validator']->GetScopeFilterForProfiles(UserRights::ListProfiles(), $oScopeOriginal->GetClass(), UR_ACTION_READ);
if ($oScopeSearch === null)
{
IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : User #' . UserRights::GetUserId() . ' has no scope query for ' . $sTargetObjectClass . ' class.');
IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : User #' . UserRights::GetUserId() . ' has no scope query for ' . $oScopeOriginal->GetClass() . ' class.');
$this->oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
}

9
datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
View File

@@ -1145,7 +1145,7 @@
<group id="resolved">
<rank>2</rank>
<title>Brick:Portal:OngoingRequests:Tab:Resolved</title>
<condition><![CDATA[SELECT Ticket AS T WHERE org_id = :current_contact->org_id AND operational_status = 'resolved']]></condition>
<condition><![CDATA[SELECT Ticket AS T WHERE operational_status = 'resolved']]></condition>
</group>
</groups>
</tabs>
@@ -1386,6 +1386,13 @@
</scope>
</scopes>
</class>
<class id="Location">
<scopes>
<scope id="all">
<oql_view><![CDATA[SELECT Location WHERE org_id = :current_contact->org_id]]></oql_view>
</scope>
</scopes>
</class>
<class id="Contact">
<scopes>
<scope id="all">