From 481fef4847c0cca2887ba2d43699756f1e691000 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Fri, 25 Nov 2016 12:02:24 +0100
Subject: [PATCH] Fixing custom fields in admin area

---
 .../modules/admin/project-values.coffee       | 26 ++++++++++---------
 .../admin-project-values-custom-fields.jade   |  8 +++---
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/coffee/modules/admin/project-values.coffee b/app/coffee/modules/admin/project-values.coffee
index 8169983d..b7ddd2f2 100644
--- a/app/coffee/modules/admin/project-values.coffee
+++ b/app/coffee/modules/admin/project-values.coffee
@@ -440,26 +440,28 @@ class ProjectCustomAttributesController extends mixOf(taiga.Controller, taiga.Pa
         "$tgLocation",
         "$tgNavUrls",
         "tgAppMetaService",
-        "$translate"
+        "$translate",
+        "tgProjectService"
     ]
 
     constructor: (@scope, @rootscope, @repo, @rs, @params, @q, @location, @navUrls, @appMetaService,
-                  @translate) ->
+                  @translate, @projectService) ->
         @scope.TYPE_CHOICES = TYPE_CHOICES
+        @scope.project = @projectService.project.toJS()
+        @scope.projectId = @scope.project.id
 
-        @scope.project = {}
+        sectionName = @translate.instant(@scope.sectionName)
+        title = @translate.instant("ADMIN.CUSTOM_ATTRIBUTES.PAGE_TITLE", {
+            "sectionName": sectionName,
+            "projectName": @scope.project.name
+        })
+        description = @scope.project.description
+        @appMetaService.setAll(title, description)
 
-        @rootscope.$on "project:loaded", =>
+        @scope.init = (type) =>
+            @scope.type = type
             @.loadCustomAttributes()
 
-            sectionName = @translate.instant(@scope.sectionName)
-            title = @translate.instant("ADMIN.CUSTOM_ATTRIBUTES.PAGE_TITLE", {
-                "sectionName": sectionName,
-                "projectName": @scope.project.name
-            })
-            description = @scope.project.description
-            @appMetaService.setAll(title, description)
-
     #########################
     # Custom Attribute
     #########################
diff --git a/app/partials/admin/admin-project-values-custom-fields.jade b/app/partials/admin/admin-project-values-custom-fields.jade
index 19cb292b..4ef46a11 100644
--- a/app/partials/admin/admin-project-values-custom-fields.jade
+++ b/app/partials/admin/admin-project-values-custom-fields.jade
@@ -20,27 +20,27 @@ div.wrapper(
         div.admin-attributes-section(
             tg-project-custom-attributes,
             ng-controller="ProjectCustomAttributesController as ctrl",
-            ng-init="type='epic'; customFieldSectionTitle='ADMIN.CUSTOM_FIELDS.EPIC_DESCRIPTION'; customFieldButtonTitle='ADMIN.CUSTOM_FIELDS.EPIC_ADD'"
+            ng-init="init('epic'); customFieldSectionTitle='ADMIN.CUSTOM_FIELDS.EPIC_DESCRIPTION'; customFieldButtonTitle='ADMIN.CUSTOM_FIELDS.EPIC_ADD'"
         )
             include ../includes/modules/admin/admin-custom-attributes
 
         div.admin-attributes-section(
             tg-project-custom-attributes,
             ng-controller="ProjectCustomAttributesController as ctrl",
-            ng-init="type='userstory'; customFieldSectionTitle='ADMIN.CUSTOM_FIELDS.US_DESCRIPTION'; customFieldButtonTitle='ADMIN.CUSTOM_FIELDS.US_ADD'"
+            ng-init="init('userstory'); customFieldSectionTitle='ADMIN.CUSTOM_FIELDS.US_DESCRIPTION'; customFieldButtonTitle='ADMIN.CUSTOM_FIELDS.US_ADD'"
         )
             include ../includes/modules/admin/admin-custom-attributes
 
         div.admin-attributes-section(
             tg-project-custom-attributes,
             ng-controller="ProjectCustomAttributesController as ctrl",
-            ng-init="type='task'; customFieldSectionTitle='ADMIN.CUSTOM_FIELDS.TASK_DESCRIPTION'; customFieldButtonTitle='ADMIN.CUSTOM_FIELDS.TASK_ADD'"
+            ng-init="init('task'); customFieldSectionTitle='ADMIN.CUSTOM_FIELDS.TASK_DESCRIPTION'; customFieldButtonTitle='ADMIN.CUSTOM_FIELDS.TASK_ADD'"
         )
             include ../includes/modules/admin/admin-custom-attributes
 
         div.admin-attributes-section(
             tg-project-custom-attributes,
             ng-controller="ProjectCustomAttributesController as ctrl",
-            ng-init="type='issue'; customFieldSectionTitle='ADMIN.CUSTOM_FIELDS.ISSUE_DESCRIPTION'; customFieldButtonTitle='ADMIN.CUSTOM_FIELDS.ISSUE_ADD'"
+            ng-init="init('issue'); customFieldSectionTitle='ADMIN.CUSTOM_FIELDS.ISSUE_DESCRIPTION'; customFieldButtonTitle='ADMIN.CUSTOM_FIELDS.ISSUE_ADD'"
         )
             include ../includes/modules/admin/admin-custom-attributes