diff --git a/app/controllers/collections/collection/item.js b/app/controllers/collections/collection/item.js index 905d654f..3dcc1d8b 100644 --- a/app/controllers/collections/collection/item.js +++ b/app/controllers/collections/collection/item.js @@ -6,15 +6,6 @@ export default Ember.Controller.extend({ actions: { - continueWorkflow(role) { - this.get('store').queryRecord('case', { - for_item: this.get('item').id, - role: 'approval' - }).then((caxe) => { - this.transitionToRoute('collections.collection.add', caxe.id); - }); - } - } }); diff --git a/app/routes/collections/collection/item.js b/app/routes/collections/collection/item.js index 1208b8bf..6f48529e 100644 --- a/app/routes/collections/collection/item.js +++ b/app/routes/collections/collection/item.js @@ -13,11 +13,17 @@ export default Ember.Route.extend({ let node = item.then((_item) => { return this.store.findRecord('node', _item.get('sourceId')); }); - + let approvalCase = item.then((_item) => { + return this.get('store').queryRecord('case', { + for_item: _item.id, + role: 'approval' + }); + }); return Ember.RSVP.hash({ collection, item, - node + node, + approvalCase }); }, @@ -40,6 +46,7 @@ export default Ember.Route.extend({ controller.set('collection', data.collection); controller.set('item', this.get('item')); controller.set('node', data.node); + controller.set('approvalCaseId', data.approvalCase.id); } }); diff --git a/app/templates/collections/collection/item.hbs b/app/templates/collections/collection/item.hbs index fd7afe8e..360df4ac 100644 --- a/app/templates/collections/collection/item.hbs +++ b/app/templates/collections/collection/item.hbs @@ -29,16 +29,18 @@
{{item.status}}
-