Merge branch '24-pages-form-conversion' of github.com:forkcms/forkcms…

… into 24-pages-form-conversion
forkcms · Jan 15, 2020 · 7a3bca7 · 7a3bca7
2 parents e16ba53 + d5ad416
commit 7a3bca7
Show file tree

Hide file tree

Showing 14 changed files with 1,288 additions and 2,927 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/Backend/Core/Layout/Css/screen.css b/src/Backend/Core/Layout/Css/screen.css
diff --git a/src/Backend/Core/Layout/Css/screen.css.map b/src/Backend/Core/Layout/Css/screen.css.map
diff --git a/src/Backend/Core/Layout/Sass/plugins/_jstree.scss b/src/Backend/Core/Layout/Sass/plugins/_jstree.scss
@@ -52,6 +52,15 @@
 .jstree-leaf > .jstree-ocl {
   cursor: default;
 }
+.jstree  ul:empty {
+  min-height: 16px;
+  max-width: 100%;
+  &:before {
+    content: '';
+    margin-left: 10px;
+    border-left: 1px solid #a6a6a6;
+  }
+}
 .jstree .jstree-open > .jstree-children {
   display: block;
 }

diff --git a/src/Backend/Modules/Pages/Ajax/GetInfo.php b/src/Backend/Modules/Pages/Ajax/GetInfo.php
diff --git a/src/Backend/Modules/Pages/Domain/Page/Page.php b/src/Backend/Modules/Pages/Domain/Page/Page.php
@@ -490,7 +490,7 @@ public static function isForbiddenToHaveChildren(int $pageId): bool
         return $pageId === self::ERROR_PAGE_ID;
     }
 
-    public function move(int $parentId, int $sequence, string $type): void
+    public function move(int $parentId, int $sequence, Type $type): void
     {
         $this->parentId = $parentId;
         $this->sequence = $sequence;

diff --git a/src/Backend/Modules/Pages/Domain/Page/PageRepository.php b/src/Backend/Modules/Pages/Domain/Page/PageRepository.php
@@ -369,6 +369,7 @@ public function getPageTree(array $parentIds, Locale $locale): array
             ->addSelect('m.seoFollow as seo_follow')
             ->addSelect('m.seoIndex as seo_index')
             ->addSelect('p.allowChildren as allow_children')
+            ->addSelect('p.allowMove as allow_move')
             ->addSelect('ifelse(count(e.id) > 0, 1, 0) AS has_extra')
             ->addSelect('group_concat(b.extraId) AS extra_ids')
             ->addSelect('ifelse(count(p2.id) != 0, 1, 0) AS has_children');
@@ -381,8 +382,8 @@ public function getPageTree(array $parentIds, Locale $locale): array
                 Page::class,
                 'p2',
                 Join::WITH,
-                'p2.parentId = p.id AND p2.status = :active ' .
-                'AND p2.hidden = :hidden AND p2.data NOT LIKE :data AND p2.locale = :locale'
+                'p2.parentId = p.id AND p2.status = :status ' .
+                'AND p2.hidden = :hidden AND (p2.data NOT LIKE :data OR p2.data IS NULL) AND p2.locale = :locale'
             )
             ->where($qb->expr()->in('p.parentId', ':parentIds'))
             ->andWhere('p.status = :status')
@@ -392,9 +393,8 @@ public function getPageTree(array $parentIds, Locale $locale): array
 
         $qb->setParameters(
             [
-                'active' => 'active',
                 'data' => '%s:9:\"is_action\";b:1;%',
-                'hidden' => 'N',
+                'hidden' => false,
                 'locale' => $locale,
                 'parentIds' => $parentIds,
                 'status' => Status::active(),

diff --git a/src/Backend/Modules/Pages/Engine/CacheBuilder.php b/src/Backend/Modules/Pages/Engine/CacheBuilder.php
@@ -114,10 +114,11 @@ protected function getData(Locale $locale): array
         foreach ($levels as $pages) {
             // loop all items on this level
             foreach ($pages as $pageId => $page) {
-                $temp = $this->getPageData($keys, $page, $locale);
-
-                // add it
-                $navigation[(string) $page['type']][$page['parent_id']][$pageId] = $temp;
+                $navigation[(string) $page['type']][$page['parent_id']][$pageId] = $this->getPageData(
+                    $keys,
+                    $page,
+                    $locale
+                );
             }
         }
 
@@ -170,6 +171,7 @@ protected function getPageData(array &$keys, array $page, Locale $locale): array
             'extra_blocks' => null,
             'has_children' => (bool) $page['has_children'],
             'allow_children' => (bool) $page['allow_children'],
+            'allow_move' => (bool) $page['allow_move'],
             'data' => $page['data'],
         ];