fix deleting contributors

bcc-code · Jan 3, 2024 · a56a899 · a56a899
1 parent 3d38a61
commit a56a899
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/admin/app/scripts/controllers/contributors.js b/admin/app/scripts/controllers/contributors.js
@@ -75,11 +75,15 @@ angular.module('bmmApp')
       if (confirm(_init.translation.warnings.confirmContributorDeletion)) {
         $scope.status = _init.translation.states.deletingContributor;
 
-        _api.contributorIdDelete($scope.model.id).always(function() {
-          $scope.$apply(function() {
-            $location.path('contributors');
+        _api.contributorIdDelete($scope.model.id)
+          .done(function() {
+            $scope.$apply(function() {
+              $location.path('contributors');
+            });
+          })
+          .fail(function() {
+            alert("unable to delete contributor. Probably it still has attached tracks.");
           });
-        });
       }
     };
 

diff --git a/admin/app/views/pages/contributors.html b/admin/app/views/pages/contributors.html
@@ -32,7 +32,7 @@ <h4>{{init.translation.page.contributors.search}}</h4>
 <div class="controlbar">
     <b>{{init.translation.page.editor.status}}</b>: {{status}}
     <button ng-click="save();" style="margin-left: .5em">{{init.translation.page.editor.save}}</button>
-    <button ng-show="user.username=='tobisokac' || user.username=='towa' "
+    <button ng-show="init.user.username=='tobisokac' || init.user.username=='towa' "
             ng-click="delete();">
         {{init.translation.page.editor.delete}}</button>
 </div>
@@ -95,7 +95,7 @@ <h3>{{init.translation.page.contributors.tracks}}</h3>
                     {{init.translation.page.editor.play}}
                 </button>
                 <button>
-                    <a ng-href="#track/{{track.id}}">
+                    <a ng-href="track/{{track.id}}">
                         {{init.translation.page.waitings.openTrack}}
                     </a>
                 </button>