From 925795d566484aa2bb17296bd3473dc6c9a17f73 Mon Sep 17 00:00:00 2001 From: Alex Motenko Date: Sun, 7 Jan 2018 11:59:03 +0200 Subject: [PATCH 1/2] adding a check against existence of status column in users_group_membership for prod env --- ...0180106144856_add_status_to_users_groups_memebrs.js | 10 +++++++--- views/dev_tools/dev_home.jade | 9 ++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/migrations/20180106144856_add_status_to_users_groups_memebrs.js b/migrations/20180106144856_add_status_to_users_groups_memebrs.js index e26e15e23..26935fb01 100644 --- a/migrations/20180106144856_add_status_to_users_groups_memebrs.js +++ b/migrations/20180106144856_add_status_to_users_groups_memebrs.js @@ -1,9 +1,13 @@ const constants = require('../models/constants'); exports.up = function(knex, Promise) { return Promise.all([ - - knex.schema.alterTable('users_groups_membership', table => { - table.enu('status', constants.CAMP_MEMBER_STATUS) + knex.schema.hasColumn('users_groups_membership', 'status') + .then(exists => { + if (!exists) { + return knex.schema.alterTable('users_groups_membership', table => { + table.enu('status', constants.CAMP_MEMBER_STATUS) + }); + } }) ]) }; diff --git a/views/dev_tools/dev_home.jade b/views/dev_tools/dev_home.jade index 0b86f073f..ee68a0eb0 100644 --- a/views/dev_tools/dev_home.jade +++ b/views/dev_tools/dev_home.jade @@ -1,6 +1,9 @@ html body h1 Welcome developers! - a( href="/dev/create-admin" ) Create admin user. (user=a, pass=a) - p - a( href="/dev/view-debug/" ) View Debugger + div(style="display: flex; margin-top: 20px;") + a( href="/dev/create-admin" ) Create admin user. (user=a, pass=a) + div(style="display: flex; margin-top: 20px;") + a( href="/dev/view-debug/" ) View Debugger + div(style="display: flex; margin-top: 20px;") + a( href="/dev/load-dummy-data/" ) Load Dummy Data From 6de5173ca12c9f0960a91237045d0f97fd72f7fe Mon Sep 17 00:00:00 2001 From: Alex Motenko Date: Sun, 7 Jan 2018 12:25:32 +0200 Subject: [PATCH 2/2] bumping version to 2.10.12 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9a938ff5a..6960271c0 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "this is part of the deployment proess, so it is important to update the version number", "version name corresponds to the github release name / tag name - https://github.com/Midburn/Spark/releases" ], - "version": "2.10.11", + "version": "2.10.12", "private": true, "scripts": { "postinstall": "bower install",