some small tweaks around #218

Just added the link to the settings and some angular improvements

PlexRequests.Core/Users/UserManagementHelper.cs

@@ -38,6 +38,14 @@ namespace PlexRequests.Core.Users
             {
                 permission += (int)Permissions.ReportIssue;
             }
+            if (settings.UsersCanViewOnlyOwnRequests)
+            {
+                permission += (int)Permissions.UsersCanViewOnlyOwnRequests;
+            }
+            if (settings.UsersCanViewOnlyOwnIssues)
+            {
+                permission += (int)Permissions.UsersCanViewOnlyOwnIssues;
+            }
 
 
             return permission;

PlexRequests.Helpers/Permissions/Permissions.cs

@@ -31,6 +31,9 @@ using System.ComponentModel.DataAnnotations;
 namespace PlexRequests.Helpers.Permissions
 {
     [Flags]
+    ////
+    //// NOTE if any are added, make sure we change the UserManagementHelper
+    //// 
     public enum Permissions
     {
         [Display(Name = "Access Administration Settings")]

PlexRequests.UI/Content/app/userManagement/userManagementController.js

@@ -19,6 +19,8 @@
         $scope.sortReverse = false;
         $scope.searchTerm = "";
 
+        $scope.hideColumns = false;
+
 
         $scope.error = {
             error: false,
@@ -35,10 +37,7 @@
             });
             $scope.selectedUser = user[0];
 
-            if (!open) {
+            openSidebar();
-                $("#wrapper").toggleClass("toggled");
-                open = true;
-            }
         }
 
         // Get all users in the system
@@ -163,6 +162,11 @@
             return closeSidebar();
         }
 
+        $scope.redirectToSettings = function() {
+            var url = createBaseUrl(getBaseUrl(), '/admin/usermanagementsettings');
+            window.location.href = url;
+        }
+
         function removeUser(id, current) {
             $scope.users = $scope.users.filter(function (user) {
                 return user.id !== id;
@@ -176,6 +180,15 @@
             if (open) {
                 open = false;
                 $("#wrapper").toggleClass("toggled");
+                $scope.hideColumns = false;
+            }
+        }
+
+        function openSidebar() {
+            if (!open) {
+                $("#wrapper").toggleClass("toggled");
+                open = true;
+                $scope.hideColumns = true;
             }
         }
 
@@ -189,12 +202,17 @@
                 entry.selected = false;
             });
         }
+
+
+        function getBaseUrl() {
+            return $('#baseUrl').text();
+        }
+
     }
 
     function successCallback(message, type) {
         generateNotify(message, type);
     };
 
-
     angular.module('PlexRequests').controller('userManagementController', ["$scope", "userManagementService", "moment", controller]);
 }());

PlexRequests.UI/Views/Admin/UserManagementSettings.cshtml

@@ -18,6 +18,8 @@
             @Html.Checkbox(Model.AutoApproveTvShows, "AutoApproveTvShows", "Auto Approve TV Show Requests")
             @Html.Checkbox(Model.AutoApproveMusic, "AutoApproveMusic", "Auto Approve Music Requests")
             @Html.Checkbox(Model.ReportIssues, "ReportIssues", "Report Issues")
+            @Html.Checkbox(Model.UsersCanViewOnlyOwnIssues, "UsersCanViewOnlyOwnIssues", "Users can only view their own issues")
+            @Html.Checkbox(Model.UsersCanViewOnlyOwnRequests, "UsersCanViewOnlyOwnRequests", "Users can only view their own requests")
 
 
 

PlexRequests.UI/Views/UserManagement/Index.cshtml

@@ -28,6 +28,7 @@
 
             <strong>Modify Permissions:</strong>
             <!--Load all permissions-->
+
             <div class="checkbox" ng-repeat="p in selectedUser.permissions">
                 <input id="permissionsCheckbox_{{$id}}" class="checkbox-custom" name="permissions[]" ng-checked="p.selected" ng-model="p.selected" type="checkbox" value="{{p.value}}" />
                 <label for="permissionsCheckbox_{{$id}}">{{p.name}}</label>
@@ -69,6 +70,9 @@
                     <br>
                     <br>
                     <div ng-show="error.error" ng-bind="error.errorMessage"></div>
+                    <br/>
+                    <br/>
+                    <br/>
                     <form name="userform" ng-submit="addUser()" novalidate>
                         <div class="form-group">
                             <input id="username" type="text" placeholder="user" ng-model="user.username" class="form-control form-control-custom" />
@@ -79,27 +83,37 @@
                         <div class="form-group">
                             <input id="email" type="email" placeholder="email address" ng-model="user.email" class="form-control form-control-custom" />
                         </div>
+                        <div class="row">
                             <h3>Permissions: </h3>
+                            <div class="col-md-5">
                                 <div class="checkbox" ng-repeat="permission in permissions">
                                     <input id="permission_{{$id}}" class="checkbox-custom" name="permission[]"
                                            ng-checked="permission.selected" ng-model="permission.selected" type="checkbox" value="{{permission.value}}" />
                                     <label for="permission_{{$id}}">{{permission.name}}</label>
                                 </div>
-
+                            </div>
 
                             <h3>Features: </h3>
+                            <div class="col-md-5">
                                 <div class="checkbox" ng-repeat="f in features">
                                     <input id="features_{{$id}}" class="checkbox-custom" name="f[]"
                                            ng-checked="f.selected" ng-model="f.selected" type="checkbox" value="{{f.value}}" />
                                     <label for="features_{{$id}}">{{f.name}}</label>
                                 </div>
+                            </div>
+                        </div>
 
 
-
+                        <div class="row">
                             <input type="submit" class="btn btn-success-outline" value="Add" />
+
+                            <button type="button" ng-click="redirectToSettings()" class="btn btn-primary-outline" style="float: right; margin-right: 10px;">Settings</button>
+                        </div>
                     </form>
 
+
                     <form>
+                        <div class="row">
                             <div class="form-group">
                                 <div class="input-group">
                                     <div class="input-group-addon">
@@ -110,6 +124,7 @@
 
                                 </div>
                             </div>
+                        </div>
                     </form>
 
                     <table class="table table-striped table-hover table-responsive table-condensed">
@@ -139,7 +154,7 @@
                                 <th>
                                     Permissions
                                 </th>
-                            <th>
+                                <th ng-hide="hideColumns">
                                     <a href="#" ng-click="sortType = 'type'; sortReverse = !sortReverse">
                                         User Type
                                         <span ng-show="sortType == 'type' && !sortReverse" class="fa fa-caret-down"></span>
@@ -147,7 +162,7 @@
                                     </a>
                                 </th>
 
-                            <th>
+                                <th ng-hide="hideColumns">
                                     <a href="#" ng-click="sortType = 'lastLoggedIn'; sortReverse = !sortReverse">
                                         Last Logged In
                                         <span ng-show="sortType == 'lastLoggedIn' && !sortReverse" class="fa fa-caret-down"></span>
@@ -170,12 +185,12 @@
                                 <td>
                                     {{u.permissionsFormattedString}}
                                 </td>
-                            <td>
+                                <td ng-hide="hideColumns">
                                     {{u.type === 1 ? 'Local User' : 'Plex User'}}
                                 </td>
-                            <td ng-bind="u.lastLoggedIn === minDate ? 'Never' : formatDate(u.lastLoggedIn)"></td>
+                                <td ng-hide="hideColumns" ng-bind="u.lastLoggedIn === minDate ? 'Never' : formatDate(u.lastLoggedIn)"></td>
                                 <td>
-                                <a href="#" ng-click="selectUser(u.id)" class="btn btn-sm btn-info-outline detailsBtn">Details/Edit</a>
+                                    <a href="#IDontExist" ng-click="selectUser(u.id)" class="btn btn-sm btn-info-outline">Details/Edit</a>
                                 </td>
                             </tr>
                         </tbody>