From 24597159f8f6817a6f54b71906ef486b6a5e1c33 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Mon, 21 Jul 2014 12:18:36 +0200 Subject: [PATCH] Adding admin for project profile -> default values --- app/coffee/app.coffee | 3 + .../modules/admin/project-profile.coffee | 11 ++-- app/coffee/modules/base.coffee | 3 +- ...jade => admin-project-default-values.jade} | 10 +-- .../admin-submenu-project-profile.jade | 4 +- .../views/modules/admin/default-values.jade | 62 ++++++++++--------- 6 files changed, 52 insertions(+), 41 deletions(-) rename app/partials/{admin-default-values.jade => admin-project-default-values.jade} (50%) diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee index 473fb5ba..6264c53a 100644 --- a/app/coffee/app.coffee +++ b/app/coffee/app.coffee @@ -54,6 +54,9 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $routeProvider.when("/project/:pslug/admin/project-profile/details", {templateUrl: "/partials/admin-project-profile.html"}) + $routeProvider.when("/project/:pslug/admin/project-profile/default-values", + {templateUrl: "/partials/admin-project-default-values.html"}) + $routeProvider.when("/project/:pslug/admin/project-profile/features", {templateUrl: "/partials/admin-project-features.html"}) diff --git a/app/coffee/modules/admin/project-profile.coffee b/app/coffee/modules/admin/project-profile.coffee index d290965a..cb2e22b7 100644 --- a/app/coffee/modules/admin/project-profile.coffee +++ b/app/coffee/modules/admin/project-profile.coffee @@ -56,10 +56,13 @@ class ProjectProfileController extends mixOf(taiga.Controller, taiga.PageMixin) loadProject: -> return @rs.projects.get(@scope.projectId).then (project) => @scope.project = project - # @scope.issueStatusById = groupBy(project.issue_statuses, (x) -> x.id) - # @scope.severityById = groupBy(project.severities, (x) -> x.id) - # @scope.priorityById = groupBy(project.priorities, (x) -> x.id) - # @scope.membersById = groupBy(project.memberships, (x) -> x.user) + @scope.pointsList = _.sortBy(project.points, "order") + @scope.usStatusList = _.sortBy(project.us_statuses, "order") + @scope.taskStatusList = _.sortBy(project.task_statuses, "order") + @scope.prioritiesList = _.sortBy(project.priorities, "order") + @scope.severitiesList = _.sortBy(project.severities, "order") + @scope.issueTypesList = _.sortBy(project.issue_types, "order") + @scope.issueStatusList = _.sortBy(project.issue_statuses, "order") return project loadInitialData: -> diff --git a/app/coffee/modules/base.coffee b/app/coffee/modules/base.coffee index 0d8ff239..84ae6033 100644 --- a/app/coffee/modules/base.coffee +++ b/app/coffee/modules/base.coffee @@ -67,7 +67,8 @@ urls = { # Admin "project-admin-home": "/project/:project/admin/project-profile/details", - "project-admin-project-profile-details": "/project/:project/admin/project-profile/details" + "project-admin-project-profile-details": "/project/:project/admin/project-profile/details", + "project-admin-project-profile-default-values": "/project/:project/admin/project-profile/default-values", "project-admin-project-profile-features": "/project/:project/admin/project-profile/features" } diff --git a/app/partials/admin-default-values.jade b/app/partials/admin-project-default-values.jade similarity index 50% rename from app/partials/admin-default-values.jade rename to app/partials/admin-project-default-values.jade index 16657321..8ec885c2 100644 --- a/app/partials/admin-default-values.jade +++ b/app/partials/admin-project-default-values.jade @@ -4,11 +4,13 @@ block head title Taiga Project management web application with scrum in mind! block content - div.wrapper - sidebar.menu-secondary.sidebar + div.wrapper(tg-project-profile, ng-controller="ProjectProfileController as ctrl", + ng-init="section='admin'") + sidebar.menu-secondary.sidebar(tg-admin-navigation="project-profile") include views/modules/admin-menu - sidebar.menu-tertiary.sidebar - include views/modules/admin-submenu + + sidebar.menu-tertiary.sidebar(tg-admin-navigation="default-values") + include views/modules/admin-submenu-project-profile section.main.admin-roles header diff --git a/app/partials/views/modules/admin-submenu-project-profile.jade b/app/partials/views/modules/admin-submenu-project-profile.jade index 91173ff1..c06f1718 100644 --- a/app/partials/views/modules/admin-submenu-project-profile.jade +++ b/app/partials/views/modules/admin-submenu-project-profile.jade @@ -8,8 +8,8 @@ section.admin-submenu a(href="", tg-nav="project-admin-project-profile-details:project=project.slug") span.title Project Details span.icon.icon-arrow-right - li#adminmenu-values - a(href="") + li#adminmenu-default-values + a(href="", tg-nav="project-admin-project-profile-default-values:project=project.slug") span.title Default Values span.icon.icon-arrow-right li#adminmenu-features diff --git a/app/partials/views/modules/admin/default-values.jade b/app/partials/views/modules/admin/default-values.jade index 35c65e5d..3e370aaa 100644 --- a/app/partials/views/modules/admin/default-values.jade +++ b/app/partials/views/modules/admin/default-values.jade @@ -1,31 +1,33 @@ section.default-values - fieldset - label(for="default-points") Default value for points selector - select(id="default-points") - option(selected) Name - fieldset - label(for="default-value-us") Default value for US status selector - select(id="default-value-us") - option(selected) Slug - fieldset - label(for="default-value-task") Default value for task status selector - select(id="default-value-task") - option(selected) Slug - fieldset - label(for="default-value-priority") Default value for priority selector - select(id="default-value-priority") - option(selected) Total story points - fieldset - label(for="default-value-severity") Default value for severity selector - select(id="default-value-severity") - option(selected) Name - fieldset - label(for="default-value-issue-type") Default value for issue type selector - select(id="default-value-issue-type") - option(selected) Slug - fieldset - label(for="default-value-issue-status") Default value for issue status selector - select(id="default-value-issue-status") - option(selected) Num. sprints - fieldset - a.button.button-green(href="", title="Save") Save + form + fieldset + label(for="default-points") Default value for points selector + select(id="default-points", ng-model="project.default_points", ng-options="s.id as s.name for s in pointsList") + + fieldset + label(for="default-value-us") Default value for US status selector + select(id="default-value-us", ng-model="project.default_us_status", ng-options="s.id as s.name for s in usStatusList") + + fieldset + label(for="default-value-task") Default value for task status selector + select(id="default-value-task", ng-model="project.default_task_status", ng-options="s.id as s.name for s in taskStatusList") + + fieldset + label(for="default-value-priority") Default value for priority selector + select(id="default-value-priority", ng-model="project.default_priority", ng-options="s.id as s.name for s in prioritiesList") + + fieldset + label(for="default-value-severity") Default value for severity selector + select(id="default-value-severity", ng-model="project.default_severity", ng-options="s.id as s.name for s in severitiesList") + + fieldset + label(for="default-value-issue-type") Default value for issue type selector + select(id="default-value-issue-type", ng-model="project.default_issue_type", ng-options="s.id as s.name for s in issueTypesList") + + fieldset + label(for="default-value-issue-status") Default value for issue status selector + select(id="default-value-issue-status", ng-model="project.default_issue_status", ng-options="s.id as s.name for s in issueStatusList") + + fieldset + input(type="submit", class="hidden") + a.button.button-green(href="", title="Save") Save