Merge pull request #3335 from ErisDS/issue-3333

switched parent_id for parent
This commit is contained in:
Hannah Wolfe 2014-07-20 17:46:26 +01:00
commit d8818a12d9
2 changed files with 2 additions and 2 deletions

View File

@ -190,7 +190,7 @@ function isPost(jsonData) {
function isTag(jsonData) {
return jsonData.hasOwnProperty('name') && jsonData.hasOwnProperty('slug') &&
jsonData.hasOwnProperty('description') && jsonData.hasOwnProperty('parent_id');
jsonData.hasOwnProperty('description') && jsonData.hasOwnProperty('parent');
}
module.exports.tables = db;

View File

@ -576,7 +576,7 @@ describe('Core Helpers', function () {
it('should return the slug with a prefixed /tag/ if the context is a tag', function (done) {
helpers.url.call({
name: 'the tag', slug: 'the-tag', description: null, parent_id: null
name: 'the tag', slug: 'the-tag', description: null, parent: null
}).then(function (rendered) {
should.exist(rendered);
rendered.should.equal('/tag/the-tag/');