Draft mode does not display first created version. Hide elements when

page is draft. #1533

CHANGELOG.md

@@ -27,6 +27,7 @@ All notable changes to this project will be documented in this file. This projec
 
 ### Fixed
 
+- [#1533](https://github.com/luyadev/luya/issues/1533) Draft mode does not display first created version. Hide elements when page is draft.
 - [#1526](https://github.com/luyadev/luya/issues/1526) Changed has-enough-space directive to use direct parent of element to check if there is enough space.
 - [#1509](https://github.com/luyadev/luya/issues/1509) Added a table-responsive-wrapper div to all responsive tables. This improves CRUD behaviour on mobile.
 - [#1479](https://github.com/luyadev/luya/issues/1479) Block group translation names where not displayed correctly. Old block groups where not deleted anymore.

modules/cms/src/admin/resources/js/cmsadmin.js

@@ -1160,6 +1160,9 @@
 									$scope.container = response.data.typeData[$scope.currentPageVersion]['contentAsArray'];
 								}
 							}
+						} else {
+							$scope.currentPageVersion = response.data.item.nav_item_type_id;
+							$scope.container = response.data.typeData[$scope.currentPageVersion]['contentAsArray'];
 						}
 					}
 

modules/cms/src/admin/views/page/_navitem.php

@@ -124,7 +124,7 @@
         <li class="nav item nav-item-title"><span>{{ item.title }}</span></li>
     </ul>
 
-    <ul class="nav nav-tabs ml-auto" role="tablist" ng-if="item.nav_item_type==1">
+    <ul class="nav nav-tabs ml-auto" role="tablist" ng-if="item.nav_item_type==1 && !isDraft">
         <li class="nav-item dropdown" ng-class="{'show': versionDropDownVisbility}">
             <a class="nav-link dropdown-toggle" role="button" ng-click="toggleVersionsDropdown()">{{ currentPageVersionAlias }}</a>
             <div class="dropdown-menu" ng-class="{'show': versionDropDownVisbility}">

modules/cms/src/admin/views/page/_navitem_settings.php

@@ -9,14 +9,14 @@
             <li class="nav-item">
                 <a class="nav-link nav-link-icon" ng-click="changeTab(1)" ng-class="{'active':tab==1}"><i class="material-icons">title</i><span><?= Module::t('cmsadmin_item_settings_titleslug'); ?></a>
             </li>
-            <li class="nav-item">
+            <li class="nav-item" ng-show="!isDraft">
                 <a class="nav-link nav-link-icon" ng-click="changeTab(3)" ng-class="{'active':tab==3}"><i class="material-icons">change_history</i><span><?= Module::t('version_create_title'); ?></span></a>
             </li>
-            <li class="nav-item">
+            <li class="nav-item" ng-show="!isDraft">
                 <a class="nav-link nav-link-icon" ng-click="changeTab(2)" ng-class="{'active':tab==2}"><i class="material-icons">track_changes</i><span><?= Module::t('versions_selector'); ?></span></a>
             </li>
-            <li><hr /></li>
-            <li ng-repeat="(key, versionItem) in typeData">
+            <li ng-show="!isDraft"><hr /></li>
+            <li ng-show="!isDraft" ng-repeat="(key, versionItem) in typeData">
                 <a class="nav-link" ng-class="{'active' : editVersionItem.id == versionItem.id && tab == 4}" ng-click="editVersion(versionItem)"><span class="badge" ng-class="{'badge-secondary': item.nav_item_type_id!=versionItem.id, 'badge-primary': item.nav_item_type_id==versionItem.id}">V{{$index+1}}</span> {{versionItem.version_alias}}</a>
             </li>
         </ul>
@@ -39,8 +39,7 @@
                 <div ng-switch-when="3">
                     <update-form-redirect data="typeDataCopy"></update-form-redirect>
                 </div>
-
-                <button style="margin-top:15px;" type="submit" class="btn btn-icon btn-save"><?= Module::t('btn_save'); ?></button>
+                <button type="submit" class="btn btn-icon btn-save"><?= Module::t('btn_save'); ?></button>
             </form>
         </div>
         <div ng-switch-when="2">

modules/cms/src/admin/views/page/_settings.php

@@ -15,7 +15,7 @@
                 <li class="nav-item">
                     <a class="nav-link nav-link-icon" ng-click="pageSettingsOverlayTab=4" ng-class="{'active':pageSettingsOverlayTab==4}"><i class="material-icons">content_copy</i><span><?= Module::t('page_update_actions_deepcopy_title'); ?></span></a>
                 </li>
-                <li class="nav-item">
+                <li class="nav-item" ng-show="!isDraft">
                     <a class="nav-link nav-link-icon" ng-click="pageSettingsOverlayTab=5" ng-class="{'active':pageSettingsOverlayTab==5}"><i class="material-icons">home</i><span><?= Module::t('cmsadmin_settings_homepage_title'); ?></span></a>
                 </li>
                 <?php if (Yii::$app->adminuser->canRoute(Module::ROUTE_PAGE_DELETE)): ?>
@@ -57,7 +57,7 @@
                 <p><?= Module::t('page_update_actions_deepcopy_text'); ?></p>
                 <p><button type="button" class="btn btn-save btn-icon" ng-click="createDeepPageCopy()"><?= Module::t('page_update_actions_deepcopy_btn'); ?></button></p>
             </div>
-            <div ng-switch-when="5">
+            <div ng-switch-when="5" ng-show="!isDraft">
                 <h1><?= Module::t('cmsadmin_settings_homepage_title'); ?></h1>
                 <p><?= Module::t('view_update_homepage_info'); ?></p>
                 <!-- OLD CODE -->

modules/cms/src/admin/views/page/update.php

@@ -56,7 +56,7 @@
                             <a class="dropdown-item" ng-click="togglePageSettingsOverlay(4)">
                                 <i class="material-icons">content_copy</i> <span><?= Module::t('page_update_actions_deepcopy_title'); ?></span>
                             </a>
-                            <a class="dropdown-item" ng-click="togglePageSettingsOverlay(5)">
+                            <a class="dropdown-item" ng-show="!isDraft" ng-click="togglePageSettingsOverlay(5)">
                                 <i class="material-icons">home</i> <span><?= Module::t('cmsadmin_settings_homepage_title'); ?></span>
                             </a>
                             <?php if (Yii::$app->adminuser->canRoute(Module::ROUTE_PAGE_DELETE)): ?>