Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-24 15:49:44 +02:00
Code Releases Activity

upgraded Ember and integrated Bootstrap 4

Browse source 
Upgraded to Ember JS 2.16.x release. This upgrade uses the new JavaScript modules API syntax.

Integrated Bootstrap 4 Beta 2 via package.json and associated popper.js library. Overridden Bootstrap styles using bootstrap.scss -- this file selectively imports the modules we need.
This commit is contained in:
Harvey Kandola 2017-11-16 13:28:05 +00:00
parent 0f04be4ea1
commit b31ab712c1
229 changed files with 1610 additions and 3181 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gui/app/pods/customize/users/route.js
View file

@ -9,14 +9,17 @@
//
// https://documize.com
import Ember from 'ember';
import { Promise as EmberPromise } from 'rsvp';
import { inject as service } from '@ember/service';
import Route from '@ember/routing/route';
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
import constants from '../../../utils/constants';
export default Ember.Route.extend(AuthenticatedRouteMixin, {
userService: Ember.inject.service('user'),
global: Ember.inject.service('global'),
appMeta: Ember.inject.service(),
export default Route.extend(AuthenticatedRouteMixin, {
userService: service('user'),
global: service('global'),
appMeta: service(),
beforeModel () {
if (!this.session.isAdmin) {
@ -25,7 +28,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
},
model() {
return new Ember.RSVP.Promise((resolve) => {
return new EmberPromise((resolve) => {
if (this.get('appMeta.authProvider') == constants.AuthProvider.Keycloak) {
this.get('global').syncExternalUsers().then(() => {
this.get('userService').getComplete().then((users) =>{