diff --git a/app/coffee/modules/common.coffee b/app/coffee/modules/common.coffee index 798628b0..cb3b0db1 100644 --- a/app/coffee/modules/common.coffee +++ b/app/coffee/modules/common.coffee @@ -36,7 +36,7 @@ CheckPermissionDirective = -> link = ($scope, $el, $attrs) -> $el.hide() - permission = $attrs.permission + permission = $attrs.tgCheckPermission #Sometimes this directive from a self included html template if $scope.project? diff --git a/app/coffee/modules/common/history.coffee b/app/coffee/modules/common/history.coffee index 43206cd6..49e55bca 100644 --- a/app/coffee/modules/common/history.coffee +++ b/app/coffee/modules/common/history.coffee @@ -174,7 +174,7 @@ HistoryDirective = ($log) ->
-
+
diff --git a/app/partials/backlog.jade b/app/partials/backlog.jade index 7505ae09..1e77370e 100644 --- a/app/partials/backlog.jade +++ b/app/partials/backlog.jade @@ -31,7 +31,7 @@ block content div.empty.empty-backlog(ng-class="{'hidden': visibleUserstories.length}", tg-backlog-empty-sortable) span.icon.icon-backlog span.title Your backlog is empty! - a(href="", title+"Create a new US", ng-click="ctrl.addNewUs('standard')", tg-check-permission="tg-check-permission", permission="add_us") You may want to create a new user story + a(href="", title+"Create a new US", ng-click="ctrl.addNewUs('standard')", tg-check-permission="add_us") You may want to create a new user story sidebar.menu-secondary.sidebar include views/modules/sprints diff --git a/app/partials/issues-detail-edit.jade b/app/partials/issues-detail-edit.jade index 48fc3138..e1652f59 100644 --- a/app/partials/issues-detail-edit.jade +++ b/app/partials/issues-detail-edit.jade @@ -41,7 +41,7 @@ block content section.us-detail-settings a.button.button-gray.clickable(ng-show="!issue.is_blocked", ng-click="ctrl.block()") Block - a.button.button-red(tg-check-permission, permission="delete_issue", ng-click="ctrl.delete()", href="") Delete + a.button.button-red(tg-check-permission="delete_issue", ng-click="ctrl.delete()", href="") Delete div.lightbox.lightbox_block.hidden(tg-lb-block, title="Blocking issue", ng-model="issue") diff --git a/app/partials/issues-detail.jade b/app/partials/issues-detail.jade index 849208af..41173be9 100644 --- a/app/partials/issues-detail.jade +++ b/app/partials/issues-detail.jade @@ -10,7 +10,7 @@ block content div.us-detail-header.header-with-actions include views/components/mainTitle .action-buttons - a.button.button-green(tg-check-permission, permission="modify_issue", href="", title="Edit", tg-nav="project-issues-detail-edit:project=project.slug,ref=issue.ref") Edit + a.button.button-green(tg-check-permission="modify_issue", href="", title="Edit", tg-nav="project-issues-detail-edit:project=project.slug,ref=issue.ref") Edit section.us-story-main-data div.us-title(ng-class="{blocked: issue.is_blocked}") diff --git a/app/partials/task-detail-edit.jade b/app/partials/task-detail-edit.jade index f88c134e..09215380 100644 --- a/app/partials/task-detail-edit.jade +++ b/app/partials/task-detail-edit.jade @@ -45,7 +45,7 @@ block content input(ng-model="task.is_iocaine", type="checkbox", id="is-iocaine", name="is-iocaine") a.button.button-gray.clickable(ng-show="!task.is_blocked", ng-click="ctrl.block()") Block - a.button.button-red(tg-check-permission, permission="delete_task", ng-click="ctrl.delete()", href="") Delete + a.button.button-red(tg-check-permission="delete_task", ng-click="ctrl.delete()", href="") Delete div.lightbox.lightbox_block.hidden(tg-lb-block, title="Blocking task", ng-model="task") div.lightbox.lightbox-select-user.hidden(tg-lb-assignedto) diff --git a/app/partials/task-detail.jade b/app/partials/task-detail.jade index 199d5dc4..c4100cfb 100644 --- a/app/partials/task-detail.jade +++ b/app/partials/task-detail.jade @@ -10,7 +10,7 @@ block content div.us-detail-header.header-with-actions include views/components/mainTitle .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 + a.button.button-green(tg-check-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 161a2f12..c1c5b832 100644 --- a/app/partials/us-detail-edit.jade +++ b/app/partials/us-detail-edit.jade @@ -48,7 +48,7 @@ block content input(ng-model="us.team_requirement", type="checkbox", id="team-requirement", name="team-requirement") a.button.button-gray.clickable(ng-show="!us.is_blocked", ng-click="ctrl.block()") Block - a.button.button-red(tg-check-permission, permission="delete_us", ng-click="ctrl.delete()", href="") Delete + a.button.button-red(tg-check-permission="delete_us", ng-click="ctrl.delete()", href="") Delete div.lightbox.lightbox_block.hidden(tg-lb-block, title="Blocking issue", ng-model="us") div.lightbox.lightbox-select-user.hidden(tg-lb-assignedto) diff --git a/app/partials/us-detail.jade b/app/partials/us-detail.jade index 857277f1..812975a5 100644 --- a/app/partials/us-detail.jade +++ b/app/partials/us-detail.jade @@ -10,7 +10,7 @@ block content div.us-detail-header.header-with-actions include views/components/mainTitle .action-buttons - a.button.button-green(tg-check-permission, permission="modify_us", href="", title="Edit", tg-nav="project-userstories-detail-edit:project=project.slug,ref=us.ref") Edit + a.button.button-green(tg-check-permission="modify_us", href="", title="Edit", tg-nav="project-userstories-detail-edit:project=project.slug,ref=us.ref") Edit section.us-story-main-data div.us-title(ng-class="{blocked: us.is_blocked}") diff --git a/app/partials/views/components/addnewus.jade b/app/partials/views/components/addnewus.jade index 371d9d3d..e3bce022 100644 --- a/app/partials/views/components/addnewus.jade +++ b/app/partials/views/components/addnewus.jade @@ -1,5 +1,5 @@ div.new-us - a.button.button-green(tg-check-permission, permission="add_us", href="", ng-click="ctrl.addNewUs('standard')", title="Add a new User Story") + a.button.button-green(tg-check-permission="add_us", href="", ng-click="ctrl.addNewUs('standard')", title="Add a new User Story") span.text + Add a new User Story - a.button.button-bulk(tg-check-permission, permission="add_us", href="", ng-click="ctrl.addNewUs('bulk')", title="Bulk") + a.button.button-bulk(tg-check-permission="add_us", href="", ng-click="ctrl.addNewUs('bulk')", title="Bulk") span.icon.icon-bulk diff --git a/app/partials/views/components/backlog-row.jade b/app/partials/views/components/backlog-row.jade index 66d36fc4..8c07c189 100644 --- a/app/partials/views/components/backlog-row.jade +++ b/app/partials/views/components/backlog-row.jade @@ -2,25 +2,25 @@ div.row.us-item-row(ng-repeat="us in visibleUserstories|orderBy:order track by u div.user-stories div.tags-block(tg-colorize-tags="us.tags", tg-colorize-tags-type="backlog") div.user-story-name - input(tg-check-permission, permission="modify_us", type="checkbox", name="") + input(tg-check-permission="modify_us", type="checkbox", name="") a.clickable(tg-nav="project-userstories-detail:project=project.slug,ref=us.ref", title="#{{ us.ref }} {{ us.subject }}") span(tg-bo-ref="us.ref") span(tg-bo-bind="us.subject") div.us-settings - a.icon.icon-edit(tg-check-permission, permission="modify_us", href="", + a.icon.icon-edit(tg-check-permission="modify_us", href="", ng-click="ctrl.editUserStory(us)", title="Edit") - a.icon.icon-delete(tg-check-permission, permission="delete_us", href="", + a.icon.icon-delete(tg-check-permission="delete_us", href="", ng-click="ctrl.deleteUserStory(us)", title="Delete") div.status(tg-us-status="us" on-update="ctrl.loadProjectStats()") a.us-status(href="", title="Status Name") span.us-status-bind - span.icon.icon-arrow-bottom(tg-check-permission, permission="modify_us") + span.icon.icon-arrow-bottom(tg-check-permission="modify_us") div.points(tg-us-points="us") a.us-points(href="", title="Points") span.points-value 0 - span.icon.icon-arrow-bottom(tg-check-permission, permission="modify_us") + span.icon.icon-arrow-bottom(tg-check-permission="modify_us") - a.icon.icon-drag-v(tg-check-permission, permission="modify_us", href="", title="Drag") + a.icon.icon-drag-v(tg-check-permission="modify_us", href="", title="Drag") diff --git a/app/partials/views/components/kanban-task.jade b/app/partials/views/components/kanban-task.jade index 96f12972..95e500dc 100644 --- a/app/partials/views/components/kanban-task.jade +++ b/app/partials/views/components/kanban-task.jade @@ -9,5 +9,5 @@ div.kanban-task-inner p.task-points span(tg-bind-html="us.total_points") -- span points - a.icon.icon-edit(tg-check-permission, permission="modify_us", href="", title="Edit") - a.icon.icon-drag-h(tg-check-permission, permission="modify_us", href="", title="Drag&Drop") + a.icon.icon-edit(tg-check-permission="modify_us", href="", title="Edit") + a.icon.icon-drag-h(tg-check-permission="modify_us", href="", title="Drag&Drop") diff --git a/app/partials/views/components/taskboard-task.jade b/app/partials/views/components/taskboard-task.jade index 10662fa9..cc569b9d 100644 --- a/app/partials/views/components/taskboard-task.jade +++ b/app/partials/views/components/taskboard-task.jade @@ -8,8 +8,8 @@ div.taskboard-task-inner span.task-num(tg-bo-ref="task.ref") a.task-name(href="", title="See task details", tg-bind-html="task.subject", tg-nav="project-tasks-detail:project=project.slug,ref=task.ref") - a.icon.icon-edit(tg-check-permission, permission="modify_task", + a.icon.icon-edit(tg-check-permission="modify_task", href="", title="Edit task") - a.icon.icon-drag-h(tg-check-permission, permission="modify_task", + a.icon.icon-drag-h(tg-check-permission="modify_task", href="", title="Drag&Drop") diff --git a/app/partials/views/modules/attachments.jade b/app/partials/views/modules/attachments.jade index 0e01c766..146dbad1 100644 --- a/app/partials/views/modules/attachments.jade +++ b/app/partials/views/modules/attachments.jade @@ -7,7 +7,7 @@ section.attachments(tg-attachments, ng-model=attachModel, ng-if="#{attachModel}. span.icon.icon-attachments span.attachments-num 0 span.attachments-text attachments - div.button.button-gray.add-attach(tg-check-permission, permission="modify_"+permissionSuffix, title="Add new attachment") + div.button.button-gray.add-attach(tg-check-permission="modify_"+permissionSuffix, title="Add new attachment") span +new file input.add-attach(type="file", multiple="multiple") diff --git a/app/partials/views/modules/issues-table.jade b/app/partials/views/modules/issues-table.jade index 944e9bed..3558c665 100644 --- a/app/partials/views/modules/issues-table.jade +++ b/app/partials/views/modules/issues-table.jade @@ -19,14 +19,14 @@ section.issues-table.basic-table(ng-class="{empty: !issues.length}") div.issue-field(tg-issue-status-inline-edition="issue") a.issue-status(href="", title="Status Name") span.issue-status-bind - span.icon.icon-arrow-bottom(tg-check-permission, permission="modify_issue") + span.icon.icon-arrow-bottom(tg-check-permission="modify_issue") div.created-field(tg-bo-bind="issue.created_date|momentFormat:'DD MMM YYYY HH:mm'") div.assigned-field(tg-issue-assigned-to-inline-edition="issue") div.issue-assignedto(title="Assigned to") figure.avatar - span.icon.icon-arrow-bottom(tg-check-permission, permission="modify_issue") + span.icon.icon-arrow-bottom(tg-check-permission="modify_issue") section.empty.empty-issues(ng-class="{hidden: issues.length}") span.icon.icon-issues diff --git a/app/partials/views/modules/kanban-table.jade b/app/partials/views/modules/kanban-table.jade index 27d27de7..3c870517 100644 --- a/app/partials/views/modules/kanban-table.jade +++ b/app/partials/views/modules/kanban-table.jade @@ -4,8 +4,8 @@ div.kanban-table h2.task-colum_name(ng-repeat="s in usStatusList track by s.id", ng-style="{'border-top-color':s.color}") span(tg-bo-bind="s.name") - a.icon.icon-plus(tg-check-permission, permission="add_us", href="", title="Add New task", ng-click="ctrl.addNewUs('standard', s.id)") - a.icon.icon-bulk(tg-check-permission, permission="add_us", href="", title="Add New bulk", ng-click="ctrl.addNewUs('bulk', s.id)") + a.icon.icon-plus(tg-check-permission="add_us", href="", title="Add New task", ng-click="ctrl.addNewUs('standard', s.id)") + a.icon.icon-bulk(tg-check-permission="add_us", href="", title="Add New bulk", ng-click="ctrl.addNewUs('bulk', s.id)") div.kanban-table-body div.kanban-table-inner(tg-kanban-row-size-fixer) diff --git a/app/partials/views/modules/lightbox-sprint-add-edit.jade b/app/partials/views/modules/lightbox-sprint-add-edit.jade index bb017427..eb62663f 100644 --- a/app/partials/views/modules/lightbox-sprint-add-edit.jade +++ b/app/partials/views/modules/lightbox-sprint-add-edit.jade @@ -20,6 +20,6 @@ form a.button.button-green(href="", title="Save") span Create - div(tg-check-permission, permission="delete_milestone") + div(tg-check-permission="delete_milestone") span.delete-sprint.hidden Do you want to delete this sprint? a.icon.icon-delete(href="", title="delete sprint") diff --git a/app/partials/views/modules/list-filters.jade b/app/partials/views/modules/list-filters.jade index f4f73213..f4b4d71e 100644 --- a/app/partials/views/modules/list-filters.jade +++ b/app/partials/views/modules/list-filters.jade @@ -1,4 +1,4 @@ -section.list-filters(tg-check-permission, permission="add_issue") +section.list-filters(tg-check-permission="add_issue") ul // li // a(href="#").active diff --git a/app/partials/views/modules/sprints.jade b/app/partials/views/modules/sprints.jade index 03e9dbc1..afd73ec6 100644 --- a/app/partials/views/modules/sprints.jade +++ b/app/partials/views/modules/sprints.jade @@ -7,7 +7,7 @@ section.sprints span.number(tg-bind-html="sprintsCounter") -- span.description
sprints div.new-sprint - a.button.button-green(tg-check-permission, permission="add_milestone", ng-click="ctrl.addNewSprint()", href="", title="Add New sprint") + a.button.button-green(tg-check-permission="add_milestone", ng-click="ctrl.addNewSprint()", href="", title="Add New sprint") span.text + New sprint section.sprint(ng-repeat="sprint in sprints track by sprint.id" @@ -16,7 +16,7 @@ section.sprints div.sprint-name a.icon.icon-arrow-up(href="", title="compact Sprint") span {{ sprint.name }} - a.icon.icon-edit(tg-check-permission, permission="modify_milestone", href="", title="Edit Sprint") + a.icon.icon-edit(tg-check-permission="modify_milestone", href="", title="Edit Sprint") div.sprint-summary div.sprint-date(tg-date-range="sprint.estimated_start,sprint.estimated_finish") ul @@ -34,6 +34,6 @@ section.sprints span(tg-bo-ref="us.ref") span(tg-bo-bind="us.subject") div.column-points.width-1(tg-bo-bind="us.total_points") - a.button.button-gray(tg-check-permission, permission="view_milestones", title="Current Sprint Taskboard" + a.button.button-gray(tg-check-permission="view_milestones", title="Current Sprint Taskboard" href="", tg-nav="project-taskboard:project=project.slug,sprint=sprint.slug") span Sprint Taskboard diff --git a/app/partials/views/modules/taskboard-table.jade b/app/partials/views/modules/taskboard-table.jade index 7cbc5fb1..e60be1fa 100644 --- a/app/partials/views/modules/taskboard-table.jade +++ b/app/partials/views/modules/taskboard-table.jade @@ -20,10 +20,10 @@ div.taskboard-table span(ng-bind="us.total_points") span points - a.icon.icon-plus(tg-check-permission, permission="add_task", + a.icon.icon-plus(tg-check-permission="add_task", href="", title="Add new task", ng-click="ctrl.addNewTask('standard', us)") - a.icon.icon-bulk(tg-check-permission, permission="add_task", + a.icon.icon-bulk(tg-check-permission="add_task", href="", title="Add new tasks in bulk", ng-click="ctrl.addNewTask('bulk', us)") @@ -37,10 +37,10 @@ div.taskboard-table div.taskboard-userstory-box.task-column h3.us-title span Unassigned tasks - a.icon.icon-plus(tg-check-permission, permission="add_task", + a.icon.icon-plus(tg-check-permission="add_task", href="", title="Add new task", ng-click="ctrl.addNewTask('standard', us)") - a.icon.icon-bulk(tg-check-permission, permission="add_task", + a.icon.icon-bulk(tg-check-permission="add_task", href="", title="Add new tasks in bulk", ng-click="ctrl.addNewTask('bulk', us)") diff --git a/app/partials/wiki-edit.jade b/app/partials/wiki-edit.jade index 260513c3..e9517ce9 100644 --- a/app/partials/wiki-edit.jade +++ b/app/partials/wiki-edit.jade @@ -6,7 +6,7 @@ block head block content div.wrapper(tg-wiki-edit, ng-controller="WikiEditController as ctrl", ng-init="section='wiki'") - sidebar.menu-secondary.extrabar(tg-check-permission, permission="view_wiki_links") + sidebar.menu-secondary.extrabar(tg-check-permission="view_wiki_links") section.wiki-nav(tg-wiki-nav, ng-model="wikiLinks") section.main.wiki div.header-with-actions diff --git a/app/partials/wiki.jade b/app/partials/wiki.jade index 98d7d2ed..7e42a6e7 100644 --- a/app/partials/wiki.jade +++ b/app/partials/wiki.jade @@ -6,7 +6,7 @@ block head block content div.wrapper(tg-wiki-detail, ng-controller="WikiDetailController as ctrl", ng-init="section='wiki'") - sidebar.menu-secondary.extrabar(tg-check-permission, permission="view_wiki_links") + sidebar.menu-secondary.extrabar(tg-check-permission="view_wiki_links") section.wiki-nav(tg-wiki-nav, ng-model="wikiLinks") section.main.wiki .header-with-actions @@ -15,10 +15,10 @@ block content span.green Wiki span.wiki-title(tg-bo-bind='wiki.slug|unslugify') .action-buttons - a.button.button-red.delete-wiki(tg-check-permission, permission="delete_wiki_page", + a.button.button-red.delete-wiki(tg-check-permission="delete_wiki_page", href="", title="Delete", ng-click="ctrl.delete()") Delete - a.button.button-green.edit-wiki(tg-check-permission, permission="modify_wiki_page", + a.button.button-green.edit-wiki(tg-check-permission="modify_wiki_page", href="", title="Edit", ng-click="ctrl.edit()") Edit include views/modules/wiki-summary