Fixed selecting multiple labs/imaging on a new request

Fixes #434
HospitalRun · Apr 25, 2016 · 841bb1e · 841bb1e
1 parent d84a59f
commit 841bb1e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/app/imaging/edit/route.js b/app/imaging/edit/route.js
@@ -9,6 +9,12 @@ export default AbstractEditRoute.extend(ChargeRoute, PatientListRoute, {
   newTitle: t('imaging.titles.new_title'),
   pricingCategory: 'Imaging',
 
+  actions: {
+    returnToAllItems: function() {
+      this.controller.send('returnToAllItems');
+    }
+  },
+
   getNewData: function() {
     return Ember.RSVP.resolve({
       selectPatient: true,

diff --git a/app/labs/edit/controller.js b/app/labs/edit/controller.js
@@ -98,7 +98,7 @@ export default AbstractEditController.extend(ChargeActions, PatientSubmodule, {
       alertMessage = i18n.t('labs.alerts.request_completed_message');
     } else {
       alertTitle = i18n.t('labs.alerts.request_saved_title');
-      alertMessage = i18n.t('labs.alerts.request_completed_message');
+      alertMessage = i18n.t('labs.alerts.request_saved_message');
     }
     if (multipleRecords) {
       afterDialogAction = this.get('cancelAction');

diff --git a/app/labs/edit/route.js b/app/labs/edit/route.js
@@ -10,6 +10,12 @@ export default AbstractEditRoute.extend(ChargeRoute, PatientListRoute, {
   newTitle: t('labs.new_title'),
   pricingCategory: 'Lab',
 
+  actions: {
+    returnToAllItems: function() {
+      this.controller.send('returnToAllItems');
+    }
+  },
+
   getNewData: function() {
     return Ember.RSVP.resolve({
       selectPatient: true,

diff --git a/app/mixins/charge-actions.js b/app/mixins/charge-actions.js
@@ -212,10 +212,7 @@ export default Ember.Mixin.create({
     if (!Ember.isEmpty(selectedItem)) {
       return new Ember.RSVP.Promise(function(resolve, reject) {
         if (Ember.isArray(selectedItem)) {
-          var pricingIds = selectedItem.map(function(pricingItem) {
-            return pricingItem.id;
-          });
-          this.store.findByIds('pricing', pricingIds).then(resolve, reject);
+          this.store.findByIds('pricing', selectedItem).then(resolve, reject);
         } else {
           this.store.find('pricing', selectedItem.id).then(resolve, reject);
         }