Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-25 02:31:59 -05:00
Code Issues Activity

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

Browse source 
Update Ember-Data.
This commit is contained in:
Hannah Wolfe 2014-12-18 16:45:00 +00:00
commit 8119ee7f6e
4 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bower.json
View file

@ -5,7 +5,7 @@
"Countable": "2.0.2", "Countable": "2.0.2",
"device": "git://github.com/matthewhudson/device.js#5347a275b66020a0d4dfe9aad81a488f8cce448d", "device": "git://github.com/matthewhudson/device.js#5347a275b66020a0d4dfe9aad81a488f8cce448d",
"ember": "1.9.0", "ember": "1.9.0",
"ember-data": "1.0.0-beta.11", "ember-data": "1.0.0-beta.12",
"ember-load-initializers": "git://github.com/stefanpenner/ember-load-initializers.git#0.0.1", "ember-load-initializers": "git://github.com/stefanpenner/ember-load-initializers.git#0.0.1",
"ember-resolver": "git://github.com/stefanpenner/ember-jj-abrams-resolver.git#181251821cf513bb58d3e192faa13245a816f75e", "ember-resolver": "git://github.com/stefanpenner/ember-jj-abrams-resolver.git#181251821cf513bb58d3e192faa13245a816f75e",
"ember-simple-auth": "0.7.2", "ember-simple-auth": "0.7.2",

3
core/client/models/post.js
View file

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

2
core/client/models/role.js
View file

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

9
core/client/models/tag.js
View file

@ -8,10 +8,15 @@ var Tag = DS.Model.extend(NProgressSaveMixin, ValidationEngine, {
name: DS.attr('string'), name: DS.attr('string'),
slug: DS.attr('string'), slug: DS.attr('string'),
description: DS.attr('string'), description: DS.attr('string'),
parent_id: DS.attr('number'), parent: DS.attr(),
meta_title: DS.attr('string'), meta_title: DS.attr('string'),
meta_description: 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; export default Tag;