Skip to content

Commit

Permalink
Merge pull request #557 from Midburn/alex-fix-user-group-membership-m…
Browse files Browse the repository at this point in the history
…igration

Fix user group membership migration
  • Loading branch information
amotenko authored Jan 7, 2018
2 parents df72386 + 6de5173 commit 9f9f119
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
10 changes: 7 additions & 3 deletions migrations/20180106144856_add_status_to_users_groups_memebrs.js
Original file line number Diff line number Diff line change
@@ -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)
});
}
})
])
};
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 6 additions & 3 deletions views/dev_tools/dev_home.jade
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 9f9f119

Please sign in to comment.