From a2cc055f0861ea59b8442cce8180580647749ce2 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 4 Jul 2014 10:54:34 +0200 Subject: [PATCH] Change ng-hide for ng-show --- app/coffee/modules/issues/detail.coffee | 10 +++++++++- app/partials/issues-detail-edit.jade | 6 +++--- app/partials/issues-detail.jade | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/coffee/modules/issues/detail.coffee b/app/coffee/modules/issues/detail.coffee index 2ffea9c7..6a4783a8 100644 --- a/app/coffee/modules/issues/detail.coffee +++ b/app/coffee/modules/issues/detail.coffee @@ -92,6 +92,15 @@ class IssueDetailController extends mixOf(taiga.Controller, taiga.PageMixin) unblock: -> @rootscope.$broadcast("unblock", @scope.issue) + delete: -> + #TODO: i18n + title = "Delete Issue" + subtitle = @scope.issue.subject + + @confirm.ask(title, subtitle).then => + @.repo.remove(@scope.issue).then => + @location.path("/project/#{@scope.project.slug}/issues") + module.controller("IssueDetailController", IssueDetailController) @@ -234,7 +243,6 @@ WatchersDirective = ($rootscope, $confirm) -> watchers = _.map(watcherIds, (watcherId) -> $scope.usersById[watcherId]) html = template({watchers: watchers, editable:editable}) $el.html(html) - console.log "--------", watchers, watchers.length if watchers.length == 0 if editable $el.find(".title").text("Add watchers") diff --git a/app/partials/issues-detail-edit.jade b/app/partials/issues-detail-edit.jade index 356a9216..bddff8af 100644 --- a/app/partials/issues-detail-edit.jade +++ b/app/partials/issues-detail-edit.jade @@ -15,7 +15,7 @@ block content div.us-title input(type="text", ng-model="issue.subject") - div.blocked-warning(ng-hide="!issue.is_blocked") + div.blocked-warning(ng-show="issue.is_blocked") span.icon.icon-warning p.blocked Blocked! p(tg-bind-html="issue.blocked_note_html") @@ -55,8 +55,8 @@ block content // label.clickable.button.button-green(for="team-requirement", ng-class="{true:'active', false:''}[issue.team_requirement]") Team requirement // input(ng-model="issue.team_requirement", type="checkbox", id="team-requirement", name="team-requirement") - a.button.button-gray.clickable(ng-hide="issue.is_blocked", ng-click="ctrl.block()") Block - a.button.button-red(href="") Delete + a.button.button-gray.clickable(ng-show="!issue.is_blocked", ng-click="ctrl.block()") Block + a.button.button-red(ng-click="ctrl.delete()", href="") Delete div.lightbox.lightbox_block.hidden(tg-lb-block, title="Blocking issue", ng-model="issue") include views/modules/lightbox_block diff --git a/app/partials/issues-detail.jade b/app/partials/issues-detail.jade index b1898211..d73d66db 100644 --- a/app/partials/issues-detail.jade +++ b/app/partials/issues-detail.jade @@ -20,7 +20,7 @@ block content a.icon.icon-arrow-left(href="", title="next issue") a.icon.icon-arrow-right(href="", title="previous issue") - div.blocked-warning(ng-hide="!issue.is_blocked") + div.blocked-warning(ng-show="issue.is_blocked") span.icon.icon-warning p.blocked Blocked! p(tg-bind-html="issue.blocked_note_html")