Merge pull request #4875 from NuGet/dev

[10-19-2017] RI of Dev to Master
NuGet · Oct 20, 2017 · 9bf609c · 9bf609c
2 parents da86aef + e130d8f
commit 9bf609c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 38 deletions.
diff --git a/src/NuGetGallery/Scripts/gallery/page-manage-owners.js b/src/NuGetGallery/Scripts/gallery/page-manage-owners.js
@@ -21,6 +21,7 @@
 
     var viewModel = {
         package: { id: packageId },
+        isUserAnAdmin: isUserAnAdmin,
         owners: ko.observableArray([]),
         newOwnerUsername: ko.observable(''),
         newOwnerMessage: ko.observable(''),
@@ -29,15 +30,7 @@
 
         message: ko.observable(''),
 
-        hasMoreThanOneOwner: function () {
-            return true;
-        },
-
-        isCurrentNamespaceOwner: function () {
-            return true;
-        },
-
-        hasMoreThanOneNamespaceOwners: function () {
+        IsAllowedToRemove: function (owner) {
             return true;
         },
 
@@ -158,51 +151,39 @@
         }
     };
 
-    viewModel.hasMoreThanOneOwner = ko.computed(function () {
+    viewModel.IsAllowedToRemove = function (owner) {
+        if (isUserAnAdmin.toLocaleLowerCase() === "True".toLocaleLowerCase()
+            || owner.pending()) {
+            return true;
+        };
+
         if (this.owners().length < 2) {
             return false;
         }
 
         var approvedOwner = 0;
+        var currentOwnerOwnsNamespace = false;
+        var namespaceOwnerCount = 0;
 
         ko.utils.arrayForEach(this.owners(), function (owner) {
             if (owner.pending() === false) {
                 approvedOwner++;
             }
-        });
 
-        return approvedOwner >= 2;
-    }, viewModel);
-
-    viewModel.isCurrentNamespaceOwner = ko.computed(function () {
-        if (this.owners().length < 2) {
-            return false;
-        }
-
-        var currentOwnerOwnsNamespace = false;
-        ko.utils.arrayForEach(this.owners(), function (owner) {
             if (owner.current === true) {
                 currentOwnerOwnsNamespace = owner.isNamespaceOwner();
             }
-        });
-
-        return currentOwnerOwnsNamespace;
-    }, viewModel);
 
-    viewModel.hasMoreThanOneNamespaceOwners = ko.computed(function () {
-        if (this.owners().length < 2) {
-            return false;
-        }
-
-        var namespaceOwnerCount = 0;
-        ko.utils.arrayForEach(this.owners(), function (owner) {
             if (owner.isNamespaceOwner() === true) {
                 namespaceOwnerCount++;
             }
         });
 
-        return namespaceOwnerCount >= 2;
-    }, viewModel);
+        return approvedOwner >= 2
+            && (!owner.isNamespaceOwner()
+                || (currentOwnerOwnsNamespace
+                    && namespaceOwnerCount >= 2));
+    };
 
     ko.applyBindings(viewModel);
 

diff --git a/src/NuGetGallery/ViewModels/ManagePackageOwnersViewModel.cs b/src/NuGetGallery/ViewModels/ManagePackageOwnersViewModel.cs
@@ -7,9 +7,12 @@ namespace NuGetGallery
 {
     public class ManagePackageOwnersViewModel : ListPackageItemViewModel
     {
+        public bool IsCurrentUserAnAdmin;
+
         public ManagePackageOwnersViewModel(Package package, IPrincipal currentUser)
             : base(package)
         {
+            IsCurrentUserAnAdmin = currentUser.IsAdministrator();
         }
     }
 }
diff --git a/src/NuGetGallery/Views/Packages/ManagePackageOwners.cshtml b/src/NuGetGallery/Views/Packages/ManagePackageOwners.cshtml
@@ -50,8 +50,7 @@
                             <span data-bind="visible: pending">(pending approval)</span>
                         </span>
                     </div>
-                    <!-- ko if: (pending() || $parent.hasMoreThanOneOwner()) 
-                        && (!isNamespaceOwner() || ($parent.isCurrentNamespaceOwner() && $parent.hasMoreThanOneNamespaceOwners())) -->
+                    <!-- ko if: $parent.IsAllowedToRemove($data) -->
                     <div class="col-md-3 remove-owner">
                         <a class="icon-link" 
                            href="#" 
@@ -62,8 +61,7 @@
                         </a>
                     </div>
                     <!-- /ko -->
-                    <!-- ko ifnot: (pending() || $parent.hasMoreThanOneOwner())
-                        && (!isNamespaceOwner() || ($parent.isCurrentNamespaceOwner() && $parent.hasMoreThanOneNamespaceOwners())) -->
+                    <!-- ko ifnot: $parent.IsAllowedToRemove($data) -->
                     <div class="col-md-3 remove-owner-disabled">
                         <a class="icon-link"
                            title="Cannot remove the only owner or reserved namespace restrictions apply.">
@@ -142,6 +140,7 @@
 @section bottomScripts {
     <script type="text/javascript">
         var packageId = "@Model.Id";
+        var isUserAnAdmin = "@Model.IsCurrentUserAnAdmin";
         var packageUrl = "@Url.Package(Model.Id)";
         var getPackageOwnersUrl = "@Url.GetPackageOwners()";
         var getAddPackageOwnerConfirmationUrl = "@Url.GetAddPackageOwnerConfirmation()";