Skip to content

Commit

Permalink
build 3760
Browse files Browse the repository at this point in the history
  • Loading branch information
pimcore-team committed Apr 27, 2016
1 parent 92e3ac8 commit f6031ae
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion pimcore/lib/Pimcore/Version.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Version
/**
* @var int
*/
public static $revision = 3759;
public static $revision = 3760;


/**
Expand Down
3 changes: 2 additions & 1 deletion pimcore/models/Element/Service.php
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,8 @@ public static function addTreeFilterJoins($cv, $childsList)
}
}

public static function getCustomViewById($id) {
public static function getCustomViewById($id)
{
$customViews = Tool::getCustomViewConfig();
if ($customViews) {
foreach ($customViews as $customView) {
Expand Down
6 changes: 3 additions & 3 deletions website_demo/config/customviews.example.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
[
"treetype" => "object",
"name" => "Articles",
"condition" => NULL,
"condition" => null,
"icon" => "/pimcore/static6/img/flat-color-icons/reading.svg",
"id" => 1,
"rootfolder" => "/blog",
"showroot" => FALSE,
"showroot" => false,
"classes" => "",
"position" => "right",
"sort" => "1",
"expanded" => TRUE,
"expanded" => true,
"having" => "o_type = \"folder\" || o5.title NOT LIKE '%magnis%'",
"joins" => [
array(
Expand Down
6 changes: 3 additions & 3 deletions website_example/config/customviews.example.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
[
"treetype" => "object",
"name" => "Articles",
"condition" => NULL,
"condition" => null,
"icon" => "/pimcore/static6/img/flat-color-icons/reading.svg",
"id" => 1,
"rootfolder" => "/blog",
"showroot" => FALSE,
"showroot" => false,
"classes" => "",
"position" => "right",
"sort" => "1",
"expanded" => TRUE,
"expanded" => true,
"having" => "o_type = \"folder\" || o5.title NOT LIKE '%magnis%'",
"joins" => [
array(
Expand Down

0 comments on commit f6031ae

Please sign in to comment.