Merge pull request #4671 from jaswilli/ember-data-beta12

Update Ember-Data.
This commit is contained in:
Hannah Wolfe 2014-12-18 16:45:00 +00:00
commit b3638316ce
3 changed files with 12 additions and 2 deletions

View File

@ -19,8 +19,11 @@ var Post = DS.Model.extend(NProgressSaveMixin, ValidationEngine, {
author: DS.belongsTo('user', {async: true}),
author_id: DS.attr('number'),
updated_at: DS.attr('moment-date'),
updated_by: DS.attr(),
published_at: DS.attr('moment-date'),
published_by: DS.belongsTo('user', {async: true}),
created_at: DS.attr('moment-date'),
created_by: DS.attr(),
tags: DS.hasMany('tag', {embedded: 'always'}),
url: DS.attr('string'),

View File

@ -4,6 +4,8 @@ var Role = DS.Model.extend({
description: DS.attr('string'),
created_at: DS.attr('moment-date'),
updated_at: DS.attr('moment-date'),
created_by: DS.attr(),
updated_by: DS.attr(),
lowerCaseName: Ember.computed('name', function () {
return this.get('name').toLocaleLowerCase();

View File

@ -8,10 +8,15 @@ var Tag = DS.Model.extend(NProgressSaveMixin, ValidationEngine, {
name: DS.attr('string'),
slug: DS.attr('string'),
description: DS.attr('string'),
parent_id: DS.attr('number'),
parent: DS.attr(),
meta_title: DS.attr('string'),
meta_description: DS.attr('string'),
image: DS.attr('string')
image: DS.attr('string'),
hidden: DS.attr('boolean'),
created_at: DS.attr('moment-date'),
updated_at: DS.attr('moment-date'),
created_by: DS.attr(),
updated_by: DS.attr()
});
export default Tag;