Skip to content

Commit

Permalink
Merge pull request #193 from patocallaghan/patoc/no-type
Browse files Browse the repository at this point in the history
Fix type.match crasher
  • Loading branch information
danielspaniel committed May 3, 2016
2 parents 3f175b5 + f97c50b commit 6e7b12a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion addon/converter/fixture-converter.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default class {
}

getTransformValueFunction(type) {
if (!this.transformKeys || type.match('-mf')) {
if (!this.transformKeys || (type && type.match('-mf'))) {
return this.noTransformFn;
}
if (!type) {
Expand Down
1 change: 1 addition & 0 deletions tests/dummy/app/models/employee.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ export default Model.extend({
titles : array('string'),
gender : attr('string'),
birthDate: attr('date'),
position: attr(),
departmentEmployments : fragmentArray('department-employment')
});

0 comments on commit 6e7b12a

Please sign in to comment.