mirrors/easyappointments
1
0
Fork 1
mirror of https://github.com/alextselegidis/easyappointments.git synced 2024-11-14 03:52:21 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix issues in the 'settings' page when connected user is not admin:

Browse source 
- The 'current user' tab, which is the first tab displayed for non admin users is blank  (regression caused by commit 355ddaeda4).
- Saving user settings fails becasue wrong setting helpers was used.
This commit is contained in:
oxteam 2018-04-25 16:34:48 +02:00
parent 43b9cf678b
commit b2c9a5f051
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/application/views/backend/settings.php
View file

@ -28,24 +28,26 @@
});
</script>
<?php $first = ""; ?>
<div id="settings-page" class="container-fluid">
<ul class="nav nav-tabs" role="tablist">
<?php if ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE): ?>
<li role="presentation" class="active">
<li role="presentation" <?php if(empty($first)) { echo 'class="active"'; $first = 'general';} ?>>
<a href="#general" aria-controls="general" role="tab" data-toggle="tab"><?= lang('general') ?></a>
</li>
<?php endif ?>
<?php if ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE): ?>
<li role="presentation">
<li role="presentation" <?php if(empty($first)) { echo 'class="active"'; $first = 'business-logic';} ?>>
<a href="#business-logic" aria-controls="business-logic" role="tab" data-toggle="tab"><?= lang('business_logic') ?></a>
</li>
<?php endif ?>
<?php if ($privileges[PRIV_USER_SETTINGS]['view'] == TRUE): ?>
<li role="presentation">
<li role="presentation" <?php if(empty($first)) { echo 'class="active"'; $first = 'current-user';} ?>>
<a href="#current-user" aria-controls="current-user" role="tab" data-toggle="tab"><?= lang('current_user') ?></a>
</li>
<?php endif ?>
<li role="presentation">
<li role="presentation" <?php if(empty($first)) { echo 'class="active"'; $first = 'about-app';} ?>>
<a href="#about-app" aria-controls="about-app" role="tab" data-toggle="tab"><?= lang('about_app') ?></a>
</li>
</ul>
@ -55,7 +57,7 @@
<!-- GENERAL TAB -->
<?php $hidden = ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE) ? '' : 'hidden' ?>
<div role="tabpanel" class="tab-pane active <?= $hidden ?>" id="general">
<div role="tabpanel" class="tab-pane <?php if($first === 'general') echo 'active'; ?> <?= $hidden ?>" id="general">
<form>
<fieldset>
<legend>
@ -163,7 +165,7 @@
<!-- BUSINESS LOGIC TAB -->
<?php $hidden = ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE) ? '' : 'hidden' ?>
<div role="tabpanel" class="tab-pane <?= $hidden ?>" id="business-logic">
<div role="tabpanel" class="tab-pane <?php if($first === 'business-logic') echo 'active'; ?> <?= $hidden ?>" id="business-logic">
<form>
<fieldset>
<legend>
@ -327,7 +329,7 @@
<!-- CURRENT USER TAB -->
<?php $hidden = ($privileges[PRIV_USER_SETTINGS]['view'] == TRUE) ? '' : 'hidden' ?>
<div role="tabpanel" class="tab-pane <?= $hidden ?>" id="current-user">
<div role="tabpanel" class="tab-pane <?php if($first === 'current-user') echo 'active'; ?> <?= $hidden ?>" id="current-user">
<form>
<div class="row">
<fieldset class="col-xs-12 col-sm-6 personal-info-wrapper">
@ -432,7 +434,7 @@
<!-- ABOUT TAB -->
<div role="tabpanel" class="tab-pane" id="about-app">
<div role="tabpanel" class="tab-pane <?php if($first === 'general') echo 'about-app'; ?>" id="about-app">
<h3>Easy!Appointments</h3>
<p>

8
src/assets/js/backend_settings.js
View file

@ -97,8 +97,12 @@ window.BackendSettings = window.BackendSettings || {};
$('#user-notifications').removeClass('active');
}
// Set default settings helper.
settings = new SystemSettings();
if($('#current-user').hasClass('active')){
settings = new UserSettings();
}else{
// Set default settings helper.
settings = new SystemSettings();
}
if (bindEventHandlers) {
_bindEventHandlers();