Skip to content

Commit c0e9d1e

Browse files
committed
Fix satisy typo
1 parent a7cabdd commit c0e9d1e

File tree

7 files changed

+267
-235
lines changed

7 files changed

+267
-235
lines changed

backend/internal/access-list.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const internalAccessList = {
3030
.omit(omissions())
3131
.insertAndFetch({
3232
name: data.name,
33-
satify_any: data.satify_any,
33+
satisfy_any: data.satisfy_any,
3434
owner_user_id: access.token.getUserId(1)
3535
});
3636
})
@@ -126,8 +126,8 @@ const internalAccessList = {
126126
.query()
127127
.where({id: data.id})
128128
.patch({
129-
name: data.name,
130-
satify_any: data.satify_any,
129+
name: data.name,
130+
satisfy_any: data.satisfy_any,
131131
});
132132
}
133133
})
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
const migrate_name = 'access_list_client_fix';
2+
const logger = require('../logger').migrate;
3+
4+
/**
5+
* Migrate
6+
*
7+
* @see http://knexjs.org/#Schema
8+
*
9+
* @param {Object} knex
10+
* @param {Promise} Promise
11+
* @returns {Promise}
12+
*/
13+
exports.up = function (knex/*, Promise*/) {
14+
logger.info('[' + migrate_name + '] Migrating Up...');
15+
16+
return knex.schema.table('access_list', function (access_list) {
17+
proxy_host.renameColumn('satify_any', 'satisfy_any');
18+
})
19+
.then(() => {
20+
logger.info('[' + migrate_name + '] access_list Table altered');
21+
});
22+
};
23+
24+
/**
25+
* Undo Migrate
26+
*
27+
* @param {Object} knex
28+
* @param {Promise} Promise
29+
* @returns {Promise}
30+
*/
31+
exports.down = function (knex, Promise) {
32+
logger.warn('[' + migrate_name + '] You can\'t migrate down this one.');
33+
return Promise.resolve(true);
34+
};

backend/models/access_list.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class AccessList extends Model {
9090
}
9191

9292
get satisfy() {
93-
return this.satify_any ? 'satisfy any' : 'satisfy all';
93+
return this.satisfy_any ? 'satisfy any' : 'satisfy all';
9494
}
9595
}
9696

0 commit comments

Comments
 (0)