-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GCW-3605 fixed issue with general-messgaes last-message
- Loading branch information
1 parent
18c5fed
commit 527f28e
Showing
2 changed files
with
42 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) { |