diff --git a/app/modules/epics/dashboard/epics-table/epics-table.controller.coffee b/app/modules/epics/dashboard/epics-table/epics-table.controller.coffee index ecc9ae69..a2032a99 100644 --- a/app/modules/epics/dashboard/epics-table/epics-table.controller.coffee +++ b/app/modules/epics/dashboard/epics-table/epics-table.controller.coffee @@ -35,14 +35,13 @@ class EpicsTableController progress: true } - toggleEpicTableOptions: () -> - @.displayOptions = !@.displayOptions - - _checkPermissions: () -> @.permissions = { canEdit: _.includes(@.project.my_permissions, 'modify_epic') } + toggleEpicTableOptions: () -> + @.displayOptions = !@.displayOptions + reorderEpics: (epic, index) -> console.log epic, index diff --git a/app/modules/epics/dashboard/epics-table/epics-table.controller.spec.coffee b/app/modules/epics/dashboard/epics-table/epics-table.controller.spec.coffee index 95f19644..30978472 100644 --- a/app/modules/epics/dashboard/epics-table/epics-table.controller.spec.coffee +++ b/app/modules/epics/dashboard/epics-table/epics-table.controller.spec.coffee @@ -44,21 +44,23 @@ describe "EpicTable", -> expect(epicTableCtrl.displayOptions).to.be.false it "can edit", () -> - epicTableCtrl = controller "EpicsTableCtrl" - epicTableCtrl.project = { - my_permissions: [ - 'modify_epic' - ] + data = { + project: { + my_permissions: [ + 'modify_epic' + ] + } } - epicTableCtrl._checkPermissions() + epicTableCtrl = controller "EpicsTableCtrl", null, data expect(epicTableCtrl.permissions.canEdit).to.be.true it "can NOT edit", () -> - epicTableCtrl = controller "EpicsTableCtrl" - epicTableCtrl.project = { - my_permissions: [ - 'modify_us' - ] + data = { + project: { + my_permissions: [ + 'modify_us' + ] + } } - epicTableCtrl._checkPermissions() + epicTableCtrl = controller "EpicsTableCtrl", null, data expect(epicTableCtrl.permissions.canEdit).to.be.false diff --git a/app/modules/epics/dashboard/epics-table/epics-table.directive.coffee b/app/modules/epics/dashboard/epics-table/epics-table.directive.coffee index 39827f77..ceb094a6 100644 --- a/app/modules/epics/dashboard/epics-table/epics-table.directive.coffee +++ b/app/modules/epics/dashboard/epics-table/epics-table.directive.coffee @@ -20,21 +20,16 @@ module = angular.module('taigaEpics') EpicsTableDirective = () -> - - link = (scope, el, attrs, ctrl) -> - ctrl._checkPermissions() - return { - link: link, templateUrl:"epics/dashboard/epics-table/epics-table.html", controller: "EpicsTableCtrl", controllerAs: "vm", - bindToController: true, - scope: { + bindToController: { epics: "=", project: "=", onUpdateEpic: "&" } + scope: {} } EpicsTableDirective.$inject = []