Show proper error message when trying to view a non-existent version [#…

…106]
modmore · Aug 22, 2019 · fced45c · fced45c
1 parent 5de9845
commit fced45c
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 6 deletions.
diff --git a/assets/components/versionx/js/mgr/action.chunk.js b/assets/components/versionx/js/mgr/action.chunk.js
@@ -35,7 +35,7 @@ VersionX.page.Chunk = function(config) {
             cls: 'modx-page-header',
             border: false
         },{
-            xtype: 'versionx-panel-chunksdetail',
+            xtype: !VersionX.record ? 'versionx-panel-notfound' : 'versionx-panel-chunksdetail',
             cls: 'x-panel-body',
             vxRecord: VersionX.record,
             vxRecordCmp: VersionX.cmrecord,

diff --git a/assets/components/versionx/js/mgr/action.plugin.js b/assets/components/versionx/js/mgr/action.plugin.js
@@ -31,7 +31,7 @@ VersionX.page.Plugin = function(config) {
             cls: 'modx-page-header',
             border: false
         },{
-            xtype: 'versionx-panel-pluginsdetail',
+            xtype: !VersionX.record ? 'versionx-panel-notfound' : 'versionx-panel-pluginsdetail',
             cls: 'x-panel-body',
             vxRecord: VersionX.record,
             vxRecordCmp: VersionX.cmrecord,

diff --git a/assets/components/versionx/js/mgr/action.resource.js b/assets/components/versionx/js/mgr/action.resource.js
@@ -34,7 +34,7 @@ VersionX.page.Resource = function(config) {
             bodyStyle: 'margin: 20px 0 0 0;',
             border: false
         },{
-            xtype: 'versionx-panel-resourcesdetail',
+            xtype: !VersionX.record ? 'versionx-panel-notfound' : 'versionx-panel-resourcesdetail',
             cls: 'x-panel-body',
             vxRecord: VersionX.record,
             vxRecordCmp: VersionX.cmrecord,

diff --git a/assets/components/versionx/js/mgr/action.snippet.js b/assets/components/versionx/js/mgr/action.snippet.js
@@ -31,7 +31,7 @@ VersionX.page.Snippet = function(config) {
             cls: 'modx-page-header',
             border: false
         },{
-            xtype: 'versionx-panel-snippetsdetail',
+            xtype: !VersionX.record ? 'versionx-panel-notfound' : 'versionx-panel-snippetsdetail',
             cls: 'x-panel-body',
             vxRecord: VersionX.record,
             vxRecordCmp: VersionX.cmrecord,

diff --git a/assets/components/versionx/js/mgr/action.template.js b/assets/components/versionx/js/mgr/action.template.js
@@ -33,7 +33,7 @@ VersionX.page.Template = function(config) {
             cls: 'modx-page-header',
             border: false
         },{
-            xtype: 'versionx-panel-templatesdetail',
+            xtype: !VersionX.record ? 'versionx-panel-notfound' : 'versionx-panel-templatesdetail',
             cls: 'x-panel-body',
             vxRecord: VersionX.record,
             vxRecordCmp: VersionX.cmrecord,

diff --git a/assets/components/versionx/js/mgr/action.templatevar.js b/assets/components/versionx/js/mgr/action.templatevar.js
@@ -32,7 +32,7 @@ VersionX.page.Template = function(config) {
             cls: 'modx-page-header',
             border: false
         },{
-            xtype: 'versionx-panel-templatevarsdetail',
+            xtype: !VersionX.record ? 'versionx-panel-notfound' : 'versionx-panel-templatevarsdetail',
             cls: 'x-panel-body',
             vxRecord: VersionX.record,
             vxRecordCmp: VersionX.cmrecord,

diff --git a/assets/components/versionx/js/mgr/common/panel.common.js b/assets/components/versionx/js/mgr/common/panel.common.js
@@ -19,3 +19,16 @@ VersionX.panel.Common.DetailPanel = function(config) {
 };
 Ext.extend(VersionX.panel.Common.DetailPanel,MODx.Panel,{});
 Ext.reg('versionx-panel-common-detailpanel',VersionX.panel.Common.DetailPanel);
+
+VersionX.panel.Common.NotFound = function(config) {
+    config = config || {};
+    Ext.apply(config,{
+        items: [{
+            xtype: 'panel',
+            html: '<div class="vx-error-panel"><p>The requested version does not exist.</p></div>'
+        }]
+    });
+    VersionX.panel.Common.NotFound.superclass.constructor.call(this,config);
+};
+Ext.extend(VersionX.panel.Common.NotFound,MODx.Panel,{});
+Ext.reg('versionx-panel-notfound',VersionX.panel.Common.NotFound);
diff --git a/core/components/versionx/controllers/base.class.php b/core/components/versionx/controllers/base.class.php
@@ -46,6 +46,13 @@ public function initialize()
                     color: #750300;
                     font-weight: bold !important;
                 }
+                .vx-error-panel {
+                    background: #ffdbdb;
+                    padding: 1em;
+                    border: 1px solid #830000;
+                    border-radius: 3px;
+                    color: #5a2a2a;
+                }
             </style>');
 
         $this->addJavascript($this->versionx->config['js_url'].'mgr/versionx.class.js');

diff --git a/core/components/versionx/docs/changelog.txt b/core/components/versionx/docs/changelog.txt
@@ -5,6 +5,7 @@ This changelog shows an overview of what changed throughout VersionX releases, w
 ++   Released on 2019-08-22   ++
 ++++++++++++++++++++++++++++++++
 - Hide users dropdown if user lacks view_user permission [#96]
+- Show proper error message when trying to view a non-existent version [#106]
 
 ++++++++++++++++++++++++++++++++
 ++   VersionX 2.2.1-pl        ++