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

upgraded Ember and Bootstrap, merged changes

Browse source
This commit is contained in:
sauls8t 2018-01-22 10:31:03 +00:00
parent b4fd42da38
commit 5dd7d9c181
114 changed files with 9814 additions and 1361 deletions
Download patch file Download diff file Expand all files Collapse all files

24
gui/app/components/customize/auth-settings.js
View file

@ -27,16 +27,20 @@ export default Component.extend({
KeycloakPublicKeyError: empty('keycloakConfig.publicKey'),
KeycloakAdminUserError: empty('keycloakConfig.adminUser'),
KeycloakAdminPasswordError: empty('keycloakConfig.adminPassword'),
keycloakConfig: {
url: '',
realm: '',
clientId: '',
publicKey: '',
adminUser: '',
adminPassword: '',
group: '',
disableLogout: false,
defaultPermissionAddSpace: false
init() {
this._super(...arguments);
this.keycloakConfig = {
url: '',
realm: '',
clientId: '',
publicKey: '',
adminUser: '',
adminPassword: '',
group: '',
disableLogout: false,
defaultPermissionAddSpace: false
};
},
didReceiveAttrs() {

1
gui/app/components/customize/smtp-settings.js
View file

@ -9,6 +9,7 @@
//
// https://documize.com
import $ from 'jquery';
import { empty } from '@ember/object/computed';
import Component from '@ember/component';

37
gui/app/components/customize/user-admin.js
View file

@ -9,6 +9,7 @@
//
// https://documize.com
import $ from 'jquery';
import Component from '@ember/component';
import { schedule, debounce } from '@ember/runloop';
import AuthProvider from '../../mixins/auth';
@ -17,13 +18,17 @@ import ModalMixin from '../../mixins/modal';
export default Component.extend(AuthProvider, ModalMixin, {
editUser: null,
deleteUser: null,
password: {},
filter: '',
filteredUsers: [],
selectedUsers: [],
hasSelectedUsers: false,
showDeleteDialog: false,
init() {
this._super(...arguments);
this.password = {};
this.filteredUsers = [];
this.selectedUsers = [];
},
didReceiveAttrs() {
this._super(...arguments);
@ -74,25 +79,29 @@ export default Component.extend(AuthProvider, ModalMixin, {
toggleActive(id) {
let user = this.users.findBy("id", id);
user.set('active', !user.get('active'));
this.attrs.onSave(user);
let cb = this.get('onSave');
cb(user);
},
toggleEditor(id) {
let user = this.users.findBy("id", id);
user.set('editor', !user.get('editor'));
this.attrs.onSave(user);
let cb = this.get('onSave');
cb(user);
},
toggleAdmin(id) {
let user = this.users.findBy("id", id);
user.set('admin', !user.get('admin'));
this.attrs.onSave(user);
let cb = this.get('onSave');
cb(user);
},
toggleUsers(id) {
let user = this.users.findBy("id", id);
user.set('viewUsers', !user.get('viewUsers'));
this.attrs.onSave(user);
let cb = this.get('onSave');
cb(user);
},
onShowEdit(id) {
@ -135,11 +144,14 @@ export default Component.extend(AuthProvider, ModalMixin, {
$('#edit-user-modal').modal('hide');
$('#edit-user-modal').modal('dispose');
this.attrs.onSave(user);
let cb = this.get('onSave');
cb(user);
if (is.not.empty(password.password) && is.not.empty(password.confirmation) &&
password.password === password.confirmation) {
this.attrs.onPassword(user, password.password);
let pw = this.get('onPassword');
pw(user, password.password);
}
},
@ -153,7 +165,9 @@ export default Component.extend(AuthProvider, ModalMixin, {
this.set('selectedUsers', []);
this.set('hasSelectedUsers', false);
this.attrs.onDelete(this.get('deleteUser.id'));
let cb = this.get('onDelete');
cb(this.get('deleteUser.id'));
return true;
},
@ -162,7 +176,8 @@ export default Component.extend(AuthProvider, ModalMixin, {
let su = this.get('selectedUsers');
su.forEach(userId => {
this.attrs.onDelete(userId);
let cb = this.get('onDelete');
cb(userId);
});
this.set('selectedUsers', []);

7
gui/app/components/customize/user-settings.js
View file

@ -9,6 +9,7 @@
//
// https://documize.com
import $ from 'jquery';
import { empty, and } from '@ember/object/computed';
import Component from '@ember/component';
import { isEmpty } from '@ember/utils';
@ -16,7 +17,6 @@ import { get, set } from '@ember/object';
import AuthProvider from '../../mixins/auth';
export default Component.extend(AuthProvider, {
newUser: { firstname: "", lastname: "", email: "", active: true },
firstnameEmpty: empty('newUser.firstname'),
lastnameEmpty: empty('newUser.lastname'),
emailEmpty: empty('newUser.email'),
@ -24,6 +24,11 @@ export default Component.extend(AuthProvider, {
hasLastnameEmptyError: and('lastnameEmpty', 'lastnameError'),
hasEmailEmptyError: and('emailEmpty', 'emailError'),
init() {
this._super(...arguments);
this.newUser = { firstname: "", lastname: "", email: "", active: true };
},
actions: {
add() {
if (isEmpty(this.get('newUser.firstname'))) {