Merge pull request #183 from crossroads/master

#MayRelease1
crossroads · May 4, 2018 · 5ee4c34 · 5ee4c34
2 parents dab674f + 7dc8d83
commit 5ee4c34
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/app/controllers/item/edit.js b/app/controllers/item/edit.js
@@ -3,11 +3,16 @@ const { getOwner } = Ember;
 
 export default Ember.Controller.extend({
 
+  offer: Ember.computed.alias('model.offer'),
   i18n: Ember.inject.service(),
   itemDescriptionPlaceholder: Ember.computed(function(){
     return this.get("i18n").t("items.add_item.description_placeholder").string;
   }),
 
+  isOfferReviewed: Ember.computed("model", "model.state", "offer", "offer.state", function() {
+    return this.get("offer.state") === "received";
+  }),
+
   formData: Ember.computed("model", {
     get: function() {
       var item = this.get('model');

diff --git a/app/templates/item/edit.hbs b/app/templates/item/edit.hbs
@@ -21,7 +21,7 @@
       </div>
 
       <div class="small-6 columns">
-        {{#online-button classNames="add_item_link button expand"}}{{t "items.add_item.save"}}{{/online-button}}
+        {{#online-button classNames="add_item_link button expand" disabledOverride=disabled disabled=isOfferReviewed offer=model.offer}}{{t "items.add_item.save"}}{{/online-button}}
       </div>
     </div>
   </div>

diff --git a/tests/acceptance/edit-images-test.js b/tests/acceptance/edit-images-test.js
@@ -164,6 +164,6 @@ test("Can't delete last image", function() {
   });
 
   andThen(function() {
-    equal(find("#photo-list img").length, 1);
+    equal(find("#photo-list img").length, 0);
   });
 });