ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1772 from emanuelschuetze/fix1750

Browse Source 
Login dialog behavior if guest mode enabled/disabled (Fixes #1750)
This commit is contained in:
Oskar Hahn 2015-12-12 09:25:36 +01:00
commit d3fba3a24e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/core/static/templates/index.html
View File

@ -91,7 +91,7 @@
</div> </div>
<!-- Login button --> <!-- Login button -->
<div ng-if="!operator.isAuthenticated()"> <div ng-if="!operator.isAuthenticated()">
<a href ui-sref="login" class="headerlink" uib-dropdown-toggle> <a href ui-sref="login({guest_enabled: true})" class="headerlink" uib-dropdown-toggle>
<i class="fa fa-sign-in"></i> <i class="fa fa-sign-in"></i>
<translate>Login</translate> <translate>Login</translate>
</a> </a>

7
openslides/users/static/js/users/site.js
View File

@ -122,10 +122,13 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
template: null, template: null,
url: '/login', url: '/login',
params: { guest_enabled: false }, params: { guest_enabled: false },
onEnter: ['$state', 'ngDialog', function($state, ngDialog) { onEnter: ['$state', '$stateParams', 'ngDialog', function($state, $stateParams, ngDialog) {
ngDialog.open({ ngDialog.open({
template: 'static/templates/core/login-form.html', template: 'static/templates/core/login-form.html',
controller: 'LoginFormCtrl', controller: 'LoginFormCtrl',
showClose: $stateParams.guest_enabled,
closeByEscape: $stateParams.guest_enabled,
closeByDocument: $stateParams.guest_enabled,
preCloseCallback: function() { preCloseCallback: function() {
$state.go('dashboard'); $state.go('dashboard');
return true; return true;
@ -145,7 +148,7 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
// Put the operator into the root scope // Put the operator into the root scope
$http.get('/users/whoami/').success(function(data) { $http.get('/users/whoami/').success(function(data) {
operator.setUser(data.user_id); operator.setUser(data.user_id);
if (data.user_id === null) { if (data.user_id === null && !data.guest_enabled) {
// redirect to login dialog if use is not logged in // redirect to login dialog if use is not logged in
$state.go('login', {guest_enabled: data.guest_enabled}); $state.go('login', {guest_enabled: data.guest_enabled});
} }