hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

delete set_ordermanager & set_exportorder classes

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-09-04 19:45:41 +02:00
parent 5e73786192
commit 74ce2341a2
18 changed files with 807 additions and 841 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Alchemy/Phrasea/Controller/RecordsRequest.php
View File

@@ -67,7 +67,7 @@ class RecordsRequest extends ArrayCollection
{
return new ArrayCollection(
array_filter($this->toArray(), function(\record_adapter $record) {
return $record->is_grouping();
return $record->is_grouping();
})
);
}
@@ -107,12 +107,13 @@ class RecordsRequest extends ArrayCollection
}
/**
* Create a new RecordRequest from current request
*
* @param \Alchemy\Phrasea\Application $app
* @param \Symfony\Component\HttpFoundation\Request $request
* @param type $flattenStories
* @param array $rightsColl
* @param array $rightsDatabox
* @param Application $app
* @param Request $request
* @param boolean $flattenStories
* @param array $rightsColl
* @param array $rightsDatabox
* @return RecordsRequest
*/
public static function fromRequest(Application $app, Request $request, $flattenStories = false, array $rightsColl = array(), array $rightsDatabox = array())
@@ -165,12 +166,14 @@ class RecordsRequest extends ArrayCollection
$to_remove[] = $id;
continue;
}
foreach ($rightsColl as $right) {
if ( ! $user->ACL()->has_right_on_base($record->get_base_id(), $right)) {
$to_remove[] = $id;
continue;
}
}
foreach ($rightsDatabox as $right) {
if ( ! $user->ACL()->has_right_on_sbas($record->get_sbas_id(), $right)) {
$to_remove[] = $id;