From bce40c24f964c0f61e46cfecd4d5e581afffa018 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Thu, 22 Oct 2015 16:16:27 +0200
Subject: [PATCH] Mone minor fixes of custom fields values

---
 .../modules/common/custom-field-values.coffee | 40 +++++++++----------
 .../custom-attribute-value.jade               |  2 +-
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/app/coffee/modules/common/custom-field-values.coffee b/app/coffee/modules/common/custom-field-values.coffee
index c0c11b9c..7af3f42d 100644
--- a/app/coffee/modules/common/custom-field-values.coffee
+++ b/app/coffee/modules/common/custom-field-values.coffee
@@ -170,24 +170,22 @@ CustomAttributeValueDirective = ($template, $selectedText, $compile, $translate,
             if editable and (edit or not value)
                 html = templateEdit(ctx)
                 html = $compile(html)($scope)
+                $el.html(html)
+
+                if attributeValue.type == DATE_TYPE
+                    datePickerConfig = datePickerConfigService.get()
+                    _.merge(datePickerConfig, {
+                        field: $el.find("input[name=value]")[0]
+                        onSelect: (date) =>
+                            selectedDate = date
+                        onOpen: =>
+                            $el.picker.setDate(selectedDate) if selectedDate?
+                    })
+                    $el.picker = new Pikaday(datePickerConfig)
             else
                 html = template(ctx)
                 html = $compile(html)($scope)
-
-            $el.html(html)
-
-            if attributeValue.type == DATE_TYPE
-                datePickerConfig = datePickerConfigService.get()
-
-                _.merge(datePickerConfig, {
-                    field: $el.find("input[name=value]")[0]
-                    onSelect: (date) =>
-                        selectedDate = date
-                    onOpen: =>
-                        $el.picker.setDate(selectedDate) if selectedDate?
-                })
-
-                $el.picker = new Pikaday(datePickerConfig)
+                $el.html(html)
 
         isEditable = ->
             permissions = $scope.project.my_permissions
@@ -206,26 +204,26 @@ CustomAttributeValueDirective = ($template, $selectedText, $compile, $translate,
 
             $scope.$apply ->
                 $ctrl.updateAttributeValue(attributeValue).then ->
-                    if attributeValue.type is "DATE_TYPE" and attributeValue.value
-                        attributeValue.value = moment(attributeValue.value, "YYYY-MM-DD").format(prettyDate)
-
                     render(attributeValue, false)
 
+        setFocusOnInputField = ->
+            $el.find("input[name='value'], textarea[name='value']").focus()
+
         # Bootstrap
         attributeValue = $scope.$eval($attrs.tgCustomAttributeValue)
         render(attributeValue)
 
         ## Actions (on view mode)
-        $el.on "click", ".custom-field-value", ->
+        $el.on "click", ".js-value-view-mode", ->
             return if not isEditable()
             return if $selectedText.get().length
             render(attributeValue, true)
-            $el.find("input[name='value'], textarea[name='value']").focus()
+            setFocusOnInputField()
 
         $el.on "click", "a.icon-edit", (event) ->
             event.preventDefault()
             render(attributeValue, true)
-            $el.find("input[name='value'], textarea[name='value']").focus()
+            setFocusOnInputField()
 
         ## Actions (on edit mode)
         $el.on "keyup", "input[name=value], textarea[name='value']", (event) ->
diff --git a/app/partials/custom-attributes/custom-attribute-value.jade b/app/partials/custom-attributes/custom-attribute-value.jade
index 79c34d0a..f7ac5620 100644
--- a/app/partials/custom-attributes/custom-attribute-value.jade
+++ b/app/partials/custom-attributes/custom-attribute-value.jade
@@ -7,7 +7,7 @@ div.custom-field-single
             <%- description %>
         <% } %>
 
-    div.custom-field-value
+    div.custom-field-value.js-value-view-mode
         span
             <%- value %>