Merge pull request #1238 from cfchase/valid-sub-attach

1372002 - Set attached subscriptions to 0 if input is not valid.
fusor · Sep 27, 2016 · eff6120 · eff6120
2 parents 1ea2f3f + 9f0d4c6
commit eff6120
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/fusor-ember-cli/app/components/tr-subscription.js b/fusor-ember-cli/app/components/tr-subscription.js
@@ -30,11 +30,18 @@ export default Ember.Component.extend({
   }),
 
   isQtyValid: Ember.computed('subscription.qtyAvailable', 'subscription.qtyToAttach', function() {
-    if ((this.get('subscription.qtyToAttach') >= 0) && (this.get('subscription.qtyAvailable') > 0)) {
-      return (this.get('subscription.qtyToAttach') <= this.get('subscription.qtyAvailable'));
+    let qtyAvailable = this.get('subscription.qtyAvailable');
+    let qtyToAttach = this.get('subscription.qtyToAttach');
+    return Ember.isPresent(qtyToAttach) && qtyToAttach >= 0 && qtyToAttach <= qtyAvailable;
+  }),
+
+  qtyToAttachClass: Ember.computed('isQtyValid', function() {
+    if (this.get('isQtyValid')) {
+      return 'center';
+    } else {
+      return 'center invalid-input';
     }
   }),
-  isQtyInValid: Ember.computed.not('isQtyValid'),
 
   disableQty: Ember.computed('subscription.qtyAvailable', function() {
     return (this.get('subscription.qtyAvailable') === 0);
@@ -76,8 +83,8 @@ export default Ember.Component.extend({
 
   actions: {
     setValidQty() {
-      if (this.get('isQtyInValid')) {
-        this.set('subscription.qtyToAttach', this.get('subscription.qtyAvailable') );
+      if (!this.get('isQtyValid')) {
+        this.set('subscription.qtyToAttach', 0 );
       }
       var pool = this.get('subscription');
       this.sendAction('saveSubscription', pool, this.get('subscription.qtyToAttach'));

diff --git a/fusor-ember-cli/app/templates/components/tr-subscription.hbs b/fusor-ember-cli/app/templates/components/tr-subscription.hbs
@@ -14,7 +14,7 @@
                           value=subscription.qtyToAttach
                           size=5
                           maxlength=5
-                          class="center {{if isQtyInValid 'invalid-input'}}"
+                          class=qtyToAttachClass
                           data-qci=attachCssId
                           disabled=disableQty
                           focus-out="setValidQty"