From 204d5ef7b00c6019865685f29ec5d7f8fa8f2660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 20 Aug 2014 13:13:59 +0200 Subject: [PATCH] Fix #730: hide comment button in edit mode --- app/partials/issues-detail-edit.jade | 1 + app/partials/task-detail-edit.jade | 24 ++++++++++++++++++++---- app/partials/task-detail.jade | 5 +++-- app/partials/us-detail-edit.jade | 1 + app/partials/views/modules/comments.jade | 6 +++++- 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/app/partials/issues-detail-edit.jade b/app/partials/issues-detail-edit.jade index ac04cb43..ccf31ce2 100644 --- a/app/partials/issues-detail-edit.jade +++ b/app/partials/issues-detail-edit.jade @@ -43,6 +43,7 @@ block content span.tab-title Activity - var commentModel = "us" + - var noSaveButton = true include views/modules/comments include views/modules/activity diff --git a/app/partials/task-detail-edit.jade b/app/partials/task-detail-edit.jade index ad81d70d..c887d9f9 100644 --- a/app/partials/task-detail-edit.jade +++ b/app/partials/task-detail-edit.jade @@ -7,10 +7,11 @@ block content form.wrapper(tg-task-detail, ng-controller="TaskDetailController as ctrl", ng-init="section='backlog'") div.main.us-detail - div.us-detail-header + div.us-detail-header.header-with-actions include views/components/mainTitle - a.button.button-green.save-task(href="", title="Save") Save - a.button.button-red.cancel(tg-nav="project-tasks-detail:project=project.slug,ref=task.ref", href="", title="Cancel") Cancel + .action-buttons + a.button.button-green.save-task(href="", title="Save") Save + a.button.button-red.cancel(tg-nav="project-tasks-detail:project=project.slug,ref=task.ref", href="", title="Cancel") Cancel section.us-story-main-data div.us-title(ng-class="{blocked: task.is_blocked}") @@ -29,7 +30,22 @@ block content - var permissionSuffix = "task" include views/modules/attachments - textarea(ng-model="task.comment", placeholder="Write here a new commet") + section.us-activity + ul.us-activity-tabs + li + a.active(href="#") + span.icon.icon-bulk + span.tab-title Comments + + li + a(href="#") + span.icon.icon-issues + span.tab-title Activity + + - var commentModel = "task" + - var noSaveButton = true + include views/modules/comments + include views/modules/activity sidebar.menu-secondary.sidebar section.us-status(tg-task-status, ng-model="task", editable="true") diff --git a/app/partials/task-detail.jade b/app/partials/task-detail.jade index 83229c63..f2ed85e2 100644 --- a/app/partials/task-detail.jade +++ b/app/partials/task-detail.jade @@ -7,9 +7,10 @@ block content div.wrapper(tg-task-detail, ng-controller="TaskDetailController as ctrl", ng-init="section='backlog'") div.main.us-detail - div.us-detail-header + div.us-detail-header.header-with-actions include views/components/mainTitle - a.button.button-green(tg-check-permission, permission="modify_task", href="", title="Edit", tg-nav="project-tasks-detail-edit:project=project.slug,ref=task.ref") Edit + .action-buttons + a.button.button-green(tg-check-permission, permission="modify_task", href="", title="Edit", tg-nav="project-tasks-detail-edit:project=project.slug,ref=task.ref") Edit section.us-story-main-data div.us-title(ng-class="{blocked: task.is_blocked}") diff --git a/app/partials/us-detail-edit.jade b/app/partials/us-detail-edit.jade index e371f73f..800dfd28 100644 --- a/app/partials/us-detail-edit.jade +++ b/app/partials/us-detail-edit.jade @@ -43,6 +43,7 @@ block content span.tab-title Activity - var commentModel = "us" + - var noSaveButton = true include views/modules/comments include views/modules/activity diff --git a/app/partials/views/modules/comments.jade b/app/partials/views/modules/comments.jade index cecd93af..21279e5d 100644 --- a/app/partials/views/modules/comments.jade +++ b/app/partials/views/modules/comments.jade @@ -1,9 +1,13 @@ //- NOTE: You must to define 'var commentModel' with the object model +//- You must to define 'var noSaveButton = true' if save button is not necessary section.us-comments div.add-comment(tg-check-permission, tg-toggle-comment, permission="modify_"+commentModel) textarea(placeholder="Write here a new commet", ng-model="commentModel.comment", tg-markitup) - a.button.button-green.save-comment(href="", title="Comment") Comment + + unless noSaveButton + a.button.button-green.save-comment(href="", title="Comment") Comment + div.comment-list //- modules/common.coffee - ChangeDirective div.comment-single(tg-change, mode="comment", ng-model="comment", ng-repeat="comment in comments")