diff --git a/app/app/routes/application.js b/app/app/routes/application.js index 3d2c8398..5c021732 100644 --- a/app/app/routes/application.js +++ b/app/app/routes/application.js @@ -20,11 +20,13 @@ const { export default Ember.Route.extend(ApplicationRouteMixin, { appMeta: service(), session: service(), + beforeModel() { return this.get('appMeta').boot().then(data => { if (data.allowAnonymousAccess) { return this.get('session').authenticate('authenticator:anonymous', data); } + return; }); }, @@ -55,4 +57,4 @@ export default Ember.Route.extend(ApplicationRouteMixin, { return true; } }, -}); +}); \ No newline at end of file diff --git a/documize/database/scripts/autobuild/db_00000.sql b/documize/database/scripts/autobuild/db_00000.sql index 710a3ecd..60568992 100644 --- a/documize/database/scripts/autobuild/db_00000.sql +++ b/documize/database/scripts/autobuild/db_00000.sql @@ -276,7 +276,5 @@ CREATE TABLE IF NOT EXISTS `userconfig` ( `key` CHAR(225) NOT NULL, `config` JSON, UNIQUE INDEX `idx_userconfig_orguserkey` (`orgid`, `userid`, `key` ASC) ) - DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; - --- TODO insert userid into pagemeta table --- ALTER TABLE `pagemeta` ADD `userid` CHAR(16) NOT NULL COLLATE utf8_bin AFTER `orgid`; +DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci +ENGINE = InnoDB;