Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-08 06:55:28 +02:00
Code Releases Activity

Prevent tooltips from showing when anonymous is set to true

Browse source
This commit is contained in:
zinyando 2016-06-30 17:17:44 +02:00
parent 8a4d0f7e70
commit dc164f2f63
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/app/authenticators/documize.js
View file

@ -24,7 +24,6 @@ export default Base.extend({
}, },
authenticate({password, email}) { authenticate({password, email}) {
debugger;
let domain = netUtil.getSubdomain(); let domain = netUtil.getSubdomain();
if (!isPresent(password) || !isPresent(email)) { if (!isPresent(password) || !isPresent(email)) {

12
app/app/mixins/tooltip.js
View file

@ -1,11 +1,11 @@
// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved. // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
// //
// This software (Documize Community Edition) is licensed under // This software (Documize Community Edition) is licensed under
// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
// //
// You can operate outside the AGPL restrictions by purchasing // You can operate outside the AGPL restrictions by purchasing
// Documize Enterprise Edition and obtaining a commercial license // Documize Enterprise Edition and obtaining a commercial license
// by contacting <sales@documize.com>. // by contacting <sales@documize.com>.
// //
// https://documize.com // https://documize.com
@ -15,9 +15,15 @@ export default Ember.Mixin.create({
tooltips: [], tooltips: [],
addTooltip(elem) { addTooltip(elem) {
if(elem == null) {
return;
}
let t = new Tooltip({ let t = new Tooltip({
target: elem target: elem
}); });
let tt = this.get('tooltips'); let tt = this.get('tooltips');
tt.push(t); tt.push(t);
}, },
@ -33,4 +39,4 @@ export default Ember.Mixin.create({
this.set('tooltips', tt); this.set('tooltips', tt);
} }
}); });

1
app/app/pods/auth/login/controller.js
View file

@ -27,6 +27,7 @@ export default Ember.Controller.extend({
this.get('session').authenticate('authenticator:documize', creds) this.get('session').authenticate('authenticator:documize', creds)
.then((response) => { .then((response) => {
this.get('audit').record("logged-in"); this.get('audit').record("logged-in");
this.transitionToRoute('folders.folder');
return response; return response;
}).catch(() => { }).catch(() => {
this.set('invalidCredentials', true); this.set('invalidCredentials', true);