Merge pull request #48 from can-anierzad/bug/ui-and-whitelist-bugs

UI tidy and whitelist fix
DNNCommunity · Feb 12, 2019 · 475e568 · 475e568
2 parents 06b8e16 + 7e11fa8
commit 475e568
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 148 deletions.
diff --git a/PolyDeploy/Clients/Manage/src/css/main.less b/PolyDeploy/Clients/Manage/src/css/main.less
@@ -8,34 +8,9 @@
 
 #cantarus-poly-deploy {
 
-    #menu {
-
-        ul {
-            list-style: none;
-            margin: 0;
-            padding: 0;
-
-            li {
-                list-style: inherit;
-                margin: 0;
-                padding: 0;
-            }
-        }
-    }
-
     .form-group {
-        &.form-group-middle {
-            label {
-                text-align: right;
-            }
-        }
-    }
-
-    .controls {
-        margin-top: 10px;
-
-        @media screen and (max-width: 767px) {
-            margin-top: 0;
+        &.form-group-last {
+            margin-bottom: 0;
         }
     }
 

diff --git a/PolyDeploy/Clients/Manage/src/js/config.js b/PolyDeploy/Clients/Manage/src/js/config.js
@@ -3,17 +3,13 @@
         function ($stateProvider, $urlRouterProvider, $httpProvider) {
 
             // Default route.
-            $urlRouterProvider.otherwise('/');
+            $urlRouterProvider.otherwise('/events');
 
             // States.
             $stateProvider
                 .state('menu', {
                     template: require('./templates/menu.html')
                 })
-                .state('menu.welcome', {
-                    url: '/',
-                    template: require('./templates/welcome.html')
-                })
                 .state('menu.users', {
                     url: '/users',
                     template: require('./templates/users.html'),

diff --git a/PolyDeploy/Clients/Manage/src/js/templates/menu.html b/PolyDeploy/Clients/Manage/src/js/templates/menu.html
@@ -4,15 +4,10 @@
 
         <!-- Menu -->
         <div class="col-sm-2">
-            <div class="panel panel-default">
-                <div class="panel-body">
-                    <ul>
-                        <li><a ui-sref="menu.welcome">Welcome</a></li>
-                        <li><a ui-sref="menu.users">API Users</a></li>
-                        <li><a ui-sref="menu.whitelist">IP Whitelist</a></li>
-                        <li><a ui-sref="menu.events">Event Log</a></li>
-                    </ul>
-                </div>
+            <div class="list-group">
+                <a class="list-group-item" ui-sref-active="active" ui-sref="menu.events">Event Log</a>
+                <a class="list-group-item" ui-sref-active="active" ui-sref="menu.users">API Users</a>
+                <a class="list-group-item" ui-sref-active="active" ui-sref="menu.whitelist">IP Whitelist</a>
             </div>
         </div>
         <!-- /Menu -->

diff --git a/PolyDeploy/Clients/Manage/src/js/templates/users.html b/PolyDeploy/Clients/Manage/src/js/templates/users.html
@@ -23,12 +23,13 @@ <h3 class="panel-title">New API User</h3>
                                 <input type="checkbox" ng-model="newUser.bypassIPWhitelist" />
                             </div>
                         </div>
-                        <div class="form-group">
+                        <div class="form-group form-group-last">
                             <div class="col-sm-offset-3 col-sm-9">
                                 <button type="button" class="btn btn-success" ng-click="createUser(newUser)">Create</button>
                             </div>
                         </div>
                     </div>
+
                     <div class="clearfix"></div>
                 </div>
             </div>

diff --git a/PolyDeploy/Clients/Manage/src/js/templates/welcome.html b/PolyDeploy/Clients/Manage/src/js/templates/welcome.html
@@ -2,10 +2,16 @@
 
     <div class="row">
         <div class="col-xs-12">
-            <h2>Welcome</h2>
-            <p>
-                This is the PolyDeply management utility.
-            </p>
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h3 class="panel-title">Welcome</h3>
+                </div>
+                <div class="panel-body">
+                    <p>
+                        This is the PolyDeply management utility.
+                    </p>
+                </div>
+            </div>
         </div>
     </div>
 

diff --git a/PolyDeploy/Clients/Manage/src/js/templates/whitelist.html b/PolyDeploy/Clients/Manage/src/js/templates/whitelist.html
diff --git a/PolyDeploy/Components/WebAPI/ActionFilters/InWhitelist.cs b/PolyDeploy/Components/WebAPI/ActionFilters/InWhitelist.cs
@@ -1,4 +1,5 @@
 using Cantarus.Modules.PolyDeploy.Components.DataAccess.Models;
+using Cantarus.Modules.PolyDeploy.Components.Exceptions;
 using Cantarus.Modules.PolyDeploy.Components.Logging;
 using System;
 using System.Net;
@@ -16,7 +17,18 @@ public override void OnActionExecuting(HttpActionContext actionContext)
             base.OnActionExecuting(actionContext);
 
             // Get whitelist state.
-            bool whitelistDisabled = SettingManager.GetSetting("WHITELIST", "STATE").Value.ToLower() == "false";
+            bool whitelistDisabled;
+
+            try
+            {
+                // Attempt to retrieve disabled state.
+                whitelistDisabled = SettingManager.GetSetting("WHITELIST", "STATE").Value.ToLower() == "false";
+            }
+            catch (SettingNotFoundException ex)
+            {
+                // Setting not set, default to off.
+                whitelistDisabled = true;
+            }
 
             // Get api user.
             string apiKey = actionContext.Request.GetApiKey();

diff --git a/PolyDeploy/PolyDeploy.csproj b/PolyDeploy/PolyDeploy.csproj
@@ -225,7 +225,6 @@
     <Content Include="Clients\Manage\src\js\controllers\UsersController.js" />
     <Content Include="Clients\Manage\src\js\services\index.js" />
     <Content Include="Clients\Manage\src\js\templates\events.html" />
-    <Content Include="Clients\Manage\src\js\templates\whitelist.html" />
     <Content Include="Clients\Manage\src\js\templates\welcome.html" />
     <Content Include="Clients\Manage\src\js\templates\menu.html" />
     <Content Include="Clients\Manage\src\js\templates\users.html" />

diff --git a/PolyDeploy/SqlDataProviders/00.09.00.SqlDataProvider b/PolyDeploy/SqlDataProviders/00.09.00.SqlDataProvider
@@ -213,8 +213,9 @@ CREATE PROCEDURE {databaseOwner}[{objectQualifier}Cantarus_PolyDeploy_SpExists]
 AS
     SELECT CASE WHEN EXISTS (
         SELECT *
-            FROM dbo.sysobjects
-            WHERE id = object_id(@SpName)
+        FROM dbo.sysobjects
+        WHERE id = object_id(@SpName)
+        AND OBJECTPROPERTY(id, N'IsProcedure') = 1
     )
     THEN CAST(1 AS BIT)
     ELSE CAST(0 AS BIT)