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

Merge pull request #1219 from jygaulier/PHRAS-271

Browse Source 
fix #PHRAS-343
This commit is contained in:
Nicolas Le Goff
2015-01-28 14:56:42 +01:00
parent 0488091c4b 39c53421ad
commit 1ad8418476
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
View File

@@ -653,11 +653,14 @@ class SearchEngineOptions
} }
$bas = array_filter($bas, function ($collection) use ($app) { $bas = array_filter($bas, function ($collection) use ($app) {
if ($app['authentication']->isAuthenticated()) { if($collection !== null) {
return $app['authentication']->getUser()->ACL()->has_access_to_base($collection->get_base_id()); if ($app['authentication']->isAuthenticated()) {
} else { return $app['authentication']->getUser()->ACL()->has_access_to_base($collection->get_base_id());
return in_array($collection, $app->getOpenCollections()); } else {
return in_array($collection, $app->getOpenCollections());
}
} }
return false; // CollectionNotFound
}); });
$databoxes = array(); $databoxes = array();

4
www/skins/prod/jquery.main-prod.js
View File

@@ -760,9 +760,9 @@ $(document).ready(function () {
var $this = $(this); var $this = $(this);
var $record_types = $('#recordtype_sel'); var $record_types = $('#recordtype_sel');
if ($this.hasClass('mode_type_reg')) { if ($this.hasClass('mode_type_reg')) {
$record_types.attr('disabled', true); $record_types.hide();
} else { } else {
$record_types.removeAttr('disabled'); $record_types.show();
} }
}); });