tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop

This commit is contained in:
m-lopez-f 2015-07-02 15:24:56 +02:00
parent 8c3056eb79 5b36f3aacf
commit 5c6f66ba52
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/class/Tree.class.php
View File

@ -1901,7 +1901,7 @@ class Tree {
if (!empty($processed_items)) {
if (!empty($this->filter["groupID"])) {
$result = self::extractItemWithID($processed_items, $this->filter["groupID"], "group");
$result = self::extractItemWithID($processed_items, $this->filter["groupID"], "group", $this->strictACL);
if ($result === false)
$processed_items = array();
@ -1909,7 +1909,7 @@ class Tree {
$processed_items = array($result);
}
else if (!empty($this->filter["tagID"])) {
$result = self::extractItemWithID($processed_items, $this->filter["tagID"], "tag");
$result = self::extractItemWithID($processed_items, $this->filter["tagID"], "tag", $this->strictACL);
if ($result === false)
$processed_items = array();

2
pandora_console/include/javascript/tree/TreeController.js
View File

@ -145,7 +145,7 @@ TreeController = {
}
if (title.length > 0) {
container
.prop("title", title)
.data("title", title)
.addClass("forced_title")
.data("use_title_for_force_title", 1); // Trick to make easier the 'force title' output
}