From bcf54d635f5de56838ff1cd29321ad1d3c66d8d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20G=C3=BCnther?= <mail@oliverguenther.de>
Date: Tue, 3 Nov 2015 20:34:15 +0100
Subject: [PATCH] Refactor watch functionality in ShowController

---
 .../app/templates/work_packages.show.html     |  4 +-
 .../work-package-details-controller.js        |  2 +-
 .../work-package-show-controller.js           | 55 ++-----------------
 3 files changed, 8 insertions(+), 53 deletions(-)

diff --git a/frontend/app/templates/work_packages.show.html b/frontend/app/templates/work_packages.show.html
index f5773d2e3a..a2c2dc6afd 100644
--- a/frontend/app/templates/work_packages.show.html
+++ b/frontend/app/templates/work_packages.show.html
@@ -22,7 +22,7 @@
         </li>
         <li class="toolbar-item" ng-if="isWatched && displayWatchButton">
           <button class="button"
-                  ng-click="unwatch()"
+                  ng-click="toggleWatch()"
                   title="{{I18n.t('js.label_unwatch_work_package')}}"
                   id="unwatch-button">
             <i class="button--icon icon-watch-1"></i>
@@ -30,7 +30,7 @@
         </li>
         <li class="toolbar-item" ng-if="!isWatched && displayWatchButton">
           <button class="button"
-                  ng-click="watch()"
+                  ng-click="toggleWatch()"
                   title="{{I18n.t('js.label_watch_work_package')}}"
                   id="watch-button">
             <i class="button--icon icon-not-watch"></i>
diff --git a/frontend/app/work_packages/controllers/work-package-details-controller.js b/frontend/app/work_packages/controllers/work-package-details-controller.js
index de1a3d069c..0621e31150 100644
--- a/frontend/app/work_packages/controllers/work-package-details-controller.js
+++ b/frontend/app/work_packages/controllers/work-package-details-controller.js
@@ -85,7 +85,7 @@ module.exports = function($scope,
   }
 
   function outputError(error) {
-    NotificationsService.addError(error.message || I18n.t('js.work_packages.error'));
+    outputMessage(error.message || I18n.t('js.work_packages.error'), true);
   }
 
   $scope.outputMessage = outputMessage; // expose to child controllers
diff --git a/frontend/app/work_packages/controllers/work-package-show-controller.js b/frontend/app/work_packages/controllers/work-package-show-controller.js
index d73fed0e51..4d2c6e09b4 100644
--- a/frontend/app/work_packages/controllers/work-package-show-controller.js
+++ b/frontend/app/work_packages/controllers/work-package-show-controller.js
@@ -142,37 +142,6 @@ module.exports = function($scope,
   $scope.projectIdentifier = $scope.workPackage.embedded.project.props.identifier;
 
 
-  $scope.watch = function() {
-    if ($scope.isWatched) {
-      return;
-    }
-
-    $scope.toggleWatchLink
-      .fetch({ ajax: {
-        method: $scope.toggleWatchLink.props.method,
-        href: $scope.toggleWatchLink.props.href,
-        contentType: 'application/json; charset=utf-8',
-        data: JSON.stringify($scope.toggleWatchLink.props.payload)
-      }})
-      .then(refreshWorkPackage, $scope.outputError);
-  };
-
-  $scope.unwatch = function() {
-    if (!$scope.isWatched) {
-      return;
-    }
-
-    $scope.toggleWatchLink
-      .fetch({ ajax: {
-        method: $scope.toggleWatchLink.props.method,
-        href: $scope.toggleWatchLink.props.href,
-        contentType: 'application/json; charset=utf-8',
-        data: JSON.stringify($scope.toggleWatchLink.props.payload)
-      }})
-      .then(refreshWorkPackage, $scope.outputError);
-  };
-
-
   function fetchProjectTypes() {
     ProjectService.getProject($scope.projectIdentifier)
       .then(function(project) {
@@ -206,7 +175,7 @@ module.exports = function($scope,
   }
 
   function outputError(error) {
-    outputMessage(error.message, true);
+    outputMessage(error.message || I18n.t('js.work_packages.error'), true);
   }
 
   $scope.outputMessage = outputMessage; // expose to child controllers
@@ -262,12 +231,6 @@ module.exports = function($scope,
     $scope.isWatched = !!workPackage.links.unwatch;
     $scope.displayWatchButton = !!workPackage.links.unwatch || !!workPackage.links.watch;
 
-    if (workPackage.links.watch === undefined) {
-      $scope.toggleWatchLink = workPackage.links.unwatch;
-    } else {
-      $scope.toggleWatchLink = workPackage.links.watch;
-    }
-
     // autocomplete path
     var projectId = workPackage.embedded.project.props.id;
     $scope.autocompletePath = PathHelper.staticWorkPackagesAutocompletePath(projectId);
@@ -326,18 +289,10 @@ module.exports = function($scope,
   }
 
   $scope.toggleWatch = function() {
-    var fetchOptions = {
-      method: $scope.toggleWatchLink.props.method
-    };
-
-    if($scope.toggleWatchLink.props.payload !== undefined) {
-      fetchOptions.contentType = 'application/json; charset=utf-8';
-      fetchOptions.data = JSON.stringify($scope.toggleWatchLink.props.payload);
-    }
-
-    $scope.toggleWatchLink
-      .fetch({ajax: fetchOptions})
-      .then(refreshWorkPackage, outputError);
+    // Toggle early to avoid delay.
+    $scope.isWatched = !$scope.isWatched;
+    WorkPackageService.toggleWatch($scope.workPackage)
+                      .then(function() { refreshWorkPackage() }, outputError);
   };
 
   $scope.canViewWorkPackageWatchers = function() {