Merge pull request #51 from can-anierzad/fix/prevent-navigate-result

Prevent navigation to result page directly
DNNCommunity · Feb 12, 2019 · f6398bb · f6398bb
2 parents 57e873d + ec2ce19
commit f6398bb
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 21 deletions.
diff --git a/PolyDeploy/Clients/Deploy/src/js/config.js b/PolyDeploy/Clients/Deploy/src/js/config.js
@@ -2,27 +2,23 @@
     function ($stateProvider, $urlRouterProvider, $httpProvider) {
 
         // Default route.
-        $urlRouterProvider.otherwise('/install/upload');
+        $urlRouterProvider.otherwise('/upload');
 
         // States.
         $stateProvider
             .state('install', {
-                url: '/install',
-                template: require('./templates/install.html'),
-                controller: 'InstallController'
+                template: require('./templates/install.html')
             })
             .state('install.upload', {
                 url: '/upload',
                 template: require('./templates/upload.html'),
                 controller: require('./controllers/UploadController')
             })
             .state('install.summary', {
-                url: '/summary',
                 template: require('./templates/summary.html'),
                 controller: 'SummaryController'
             })
             .state('install.result', {
-                url: '/result',
                 template: require('./templates/result.html'),
                 controller: 'ResultController'
             })

diff --git a/PolyDeploy/Clients/Deploy/src/js/controllers/InstallController.js b/PolyDeploy/Clients/Deploy/src/js/controllers/InstallController.js
diff --git a/PolyDeploy/Clients/Deploy/src/js/templates/install.html b/PolyDeploy/Clients/Deploy/src/js/templates/install.html
@@ -10,13 +10,6 @@
 </div>
 <!-- /Warnings-->
 
-<!-- Install Progression -->
-<div class="row">
-    <div class="col-xs-12">
-        <span>Install Progression</span>
-    </div>
-</div>
-<!-- /Install Progression -->
 <!-- Subview -->
 <div class="row">
     <div class="col-xs-12">

diff --git a/PolyDeploy/PolyDeploy.csproj b/PolyDeploy/PolyDeploy.csproj
@@ -231,7 +231,6 @@
     <Content Include="Images\polydeploy-logo-icon.png" />
     <Content Include="webpack.base.js" />
     <Content Include="Clients\Deploy\src\js\app.js" />
-    <Content Include="Clients\Deploy\src\js\controllers\InstallController.js" />
     <Content Include="Clients\Deploy\src\js\controllers\ResultController.js" />
     <Content Include="Clients\Deploy\src\js\controllers\SummaryController.js" />
     <Content Include="Clients\Deploy\src\js\controllers\UploadController.js" />