Skip to content

Commit

Permalink
GCW-3605 fixed issue with general-messgaes last-message
Browse files Browse the repository at this point in the history
  • Loading branch information
swatijadhav committed Apr 27, 2021
1 parent 18c5fed commit 527f28e
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 0 deletions.
1 change: 1 addition & 0 deletions app/controllers/review_offer/items.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export default Ember.Controller.extend({
"offer.messages.[]",
function() {
return this.get("offer.messages")
.filterBy("item", null)
.filter(m => !m.get("isCharityConversation"))
.sortBy("createdAt")
.get("lastObject");
Expand Down
41 changes: 41 additions & 0 deletions app/models/package_type.js.rej
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
diff a/app/models/package_type.js b/app/models/package_type.js (rejected hunks)
@@ -1,2 +1,2 @@
-import DS from 'ember-data';
-import Ember from 'ember';
+import DS from "ember-data";
+import Ember from "ember";
@@ -9,7 +9,7 @@ export default DS.Model.extend({
- name: attr('string'),
- otherTerms: attr('string'),
- code: attr('string'),
- isItemTypeNode: attr('boolean', {defaultValue: false}),
- visibleInSelects: attr('boolean', {defaultValue: false}),
- defaultChildPackages: attr('string'),
- otherChildPackages: attr('string'),
+ name: attr("string"),
+ otherTerms: attr("string"),
+ code: attr("string"),
+ isItemTypeNode: attr("boolean", { defaultValue: false }),
+ visibleInSelects: attr("boolean", { defaultValue: false }),
+ defaultChildPackages: attr("string"),
+ otherChildPackages: attr("string"),
@@ -17,3 +17,3 @@ export default DS.Model.extend({
- location: belongsTo('location', { async: false }),
- packages: hasMany('package', { inverse: 'packageType' }),
- packagesCount: Ember.computed.alias("packages.length"),
+ location: belongsTo("location", { async: false }),
+ packages: hasMany("package", { inverse: "packageType" }),
+ packagesCount: Ember.computed.alias("packages.length"),
@@ -30 +30,3 @@ export default DS.Model.extend({
- return this.defaultChildPackagesList().concat(this.otherChildPackagesList());
+ return this.defaultChildPackagesList().concat(
+ this.otherChildPackagesList()
+ );
@@ -33,2 +35,2 @@ export default DS.Model.extend({
- _getPackages: function(model, packageNames){
- var array = (packageNames || "").split(',').filter(Boolean);
+ _getPackages: function(model, packageNames) {
+ var array = (packageNames || "").split(",").filter(Boolean);
@@ -38 +40 @@ export default DS.Model.extend({
- allPackageTypes.filter(function (pkg) {
+ allPackageTypes.filter(function(pkg) {

0 comments on commit 527f28e

Please sign in to comment.