From 33d18a173c44f9862ff306b555486d9ee7bb7b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Wed, 20 Aug 2014 12:39:02 +0200
Subject: [PATCH] Fix #175: Validate project value and revert modifications if
 cancel button is clicked

---
 app/coffee/modules/admin/project-values.coffee        | 11 ++++++++---
 app/partials/views/modules/admin/project-points.jade  |  4 ++--
 app/partials/views/modules/admin/project-status.jade  |  4 ++--
 app/partials/views/modules/admin/project-types.jade   |  4 ++--
 .../views/modules/admin/project-us-status.jade        |  4 ++--
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/coffee/modules/admin/project-values.coffee b/app/coffee/modules/admin/project-values.coffee
index 5da8a735..a99434e0 100644
--- a/app/coffee/modules/admin/project-values.coffee
+++ b/app/coffee/modules/admin/project-values.coffee
@@ -93,6 +93,7 @@ class ProjectValuesController extends mixOf(taiga.Controller, taiga.PageMixin)
 
 module.controller("ProjectValuesController", ProjectValuesController)
 
+
 #############################################################################
 ## Project values directive
 #############################################################################
@@ -228,8 +229,11 @@ ProjectValuesDirective = ($log, $repo, $confirm, $location, animationFrame) ->
             event.preventDefault()
             target = angular.element(event.currentTarget)
             row = target.parents(".row.table-main")
-            row.hide()
-            row.siblings(".visualization").css("display": "flex")
+            value = target.scope().value
+            $scope.$apply ->
+                row.hide()
+                value.revert()
+                row.siblings(".visualization").css("display": "flex")
 
         $el.on "click", ".delete-value", (event) ->
             event.preventDefault()
@@ -262,7 +266,8 @@ ProjectValuesDirective = ($log, $repo, $confirm, $location, animationFrame) ->
 
     return {link:link}
 
-module.directive("tgProjectValues", ["$log", "$tgRepo", "$tgConfirm", "$tgLocation", "animationFrame", ProjectValuesDirective])
+module.directive("tgProjectValues", ["$log", "$tgRepo", "$tgConfirm", "$tgLocation", "animationFrame",
+                                     ProjectValuesDirective])
 
 
 #############################################################################
diff --git a/app/partials/views/modules/admin/project-points.jade b/app/partials/views/modules/admin/project-points.jade
index 7980311e..211b255b 100644
--- a/app/partials/views/modules/admin/project-points.jade
+++ b/app/partials/views/modules/admin/project-points.jade
@@ -8,8 +8,8 @@ section.project-values-table
             div.project-values-settings
 
     div.project-values-body
-        form.sortable
-            div(ng-repeat="value in values")
+        div.sortable
+            form(ng-repeat="value in values")
                 div.project-values-row.row.table-main.visualization
                     span.icon.icon-drag-v
 
diff --git a/app/partials/views/modules/admin/project-status.jade b/app/partials/views/modules/admin/project-status.jade
index e0ae1af0..5333df57 100644
--- a/app/partials/views/modules/admin/project-status.jade
+++ b/app/partials/views/modules/admin/project-status.jade
@@ -7,8 +7,8 @@ section.colors-table
             div.options-column
 
     div.table-main
-        form.sortable
-            div(ng-repeat="value in values")
+        div.sortable
+            form(ng-repeat="value in values")
                 div.row.table-main.visualization
                     span.icon.icon-drag-v
                     div.color-column
diff --git a/app/partials/views/modules/admin/project-types.jade b/app/partials/views/modules/admin/project-types.jade
index 41c6d4f7..d58f29f8 100644
--- a/app/partials/views/modules/admin/project-types.jade
+++ b/app/partials/views/modules/admin/project-types.jade
@@ -6,8 +6,8 @@ section.colors-table
             div.options-column
 
     div.table-main
-        form.sortable
-            div(ng-repeat="value in values")
+        div.sortable
+            form(ng-repeat="value in values")
                 div.row.table-main.visualization
                     span.icon.icon-drag-v
 
diff --git a/app/partials/views/modules/admin/project-us-status.jade b/app/partials/views/modules/admin/project-us-status.jade
index 7992b0c9..ca457484 100644
--- a/app/partials/views/modules/admin/project-us-status.jade
+++ b/app/partials/views/modules/admin/project-us-status.jade
@@ -8,8 +8,8 @@ section.colors-table
             div.options-column
 
     div.table-main
-        form.sortable
-            div(ng-repeat="value in values")
+        div.sortable
+            form(ng-repeat="value in values")
                 div.row.table-main.visualization
                     span.icon.icon-drag-v