From 9575b257118043d1c06c8057b64523e969f71341 Mon Sep 17 00:00:00 2001 From: Hannah Wolfe Date: Sun, 20 Jul 2014 16:39:56 +0100 Subject: [PATCH] switched parent_id for parent fixes #3333 --- core/server/data/schema.js | 2 +- core/test/unit/server_helpers_index_spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/server/data/schema.js b/core/server/data/schema.js index 111b0f5434..320f79de10 100644 --- a/core/server/data/schema.js +++ b/core/server/data/schema.js @@ -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; diff --git a/core/test/unit/server_helpers_index_spec.js b/core/test/unit/server_helpers_index_spec.js index cf47bf39e8..1c49339149 100644 --- a/core/test/unit/server_helpers_index_spec.js +++ b/core/test/unit/server_helpers_index_spec.js @@ -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/');