Browse Source

Add policy to allow user to view logs

Kristan Kenney 5 years ago
parent
commit
3878a8bf39

+ 2 - 1
bin/v-list-sys-config

@@ -78,7 +78,8 @@ json_list() {
         "RESTRICTED_ADMIN": "'$RESTRICTED_ADMIN'",
         "HIDE_ADMIN_ACCOUNT": "'$HIDE_ADMIN_ACCOUNT'",
         "POLICY_USER_EDIT_DETAILS": "'$POLICY_USER_EDIT_DETAILS'",
-        "POLICY_USER_DELETE_LOGS": "'$POLICY_USER_DELETE_LOGS'"
+        "POLICY_USER_DELETE_LOGS": "'$POLICY_USER_DELETE_LOGS'",
+        "POLICY_USER_VIEW_LOGS": "'$POLICY_USER_VIEW_LOGS'"
     }
     }'
 }

+ 2 - 0
web/templates/user/edit_user.html

@@ -3,7 +3,9 @@
           <div class="l-unit-toolbar__buttonstrip">
             <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back')?></a>
             <a href="/list/key/" id="btn-create" class="ui-button cancel" dir="ltr" title="<?=_('Manage SSH keys');?>"><i class="fas fa-key status-icon orange"></i><?=_('Manage SSH keys')?></a>
+            <? if (($_SESSION['userContext'] === 'user') && ($_SESSION['POLICY_USER_DELETE_LOGS'] === 'yes')) {?>
             <a href="/list/log/" id="btn-create" class="ui-button cancel" dir="ltr" title="<?=_('Logs');?>"><i class="fas fa-history status-icon maroon"></i><?=_('Logs')?></a>
+            <? } ?>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
             <a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save')?></a>

+ 1 - 1
web/templates/user/list_log.html

@@ -6,7 +6,7 @@
     </div>
     <div class="l-unit-toolbar__buttonstrip float-right">
       <a href="javascript:location.reload();" class="ui-button cancel" dir="ltr"><i class="fas fa-redo status-icon green"></i><?=_('Refresh')?></a>
-      <? if (($_SESSION['userContext'] === 'user') && ($_SESSION['POLICY_USER_DELETE_LOGS'] === 'yes')) {?>
+      <? if (($_SESSION['userContext'] === 'user') && ($_SESSION['POLICY_USER_DELETE_LOGS'] === 'yes') || (!isset($_SESSION['POLICY_USER_DELETE_LOGS']))) {?>
         <div class="actions-panel display-inline-block" key-action="js">
           <a class="data-controls do_delete ui-button danger cancel">
             <i class="do_delete fas fa-times-circle status-icon red"></i><?=_('Delete')?>

+ 1 - 1
web/templates/user/list_log_auth.html

@@ -5,7 +5,7 @@
     </div>
     <div class="l-unit-toolbar__buttonstrip float-right">
       <a href="javascript:location.reload();" class="ui-button cancel" dir="ltr"><i class="fas fa-redo status-icon green"></i><?=_('Refresh')?></a>
-      <? if (($_SESSION['userContext'] === 'user') && ($_SESSION['POLICY_USER_DELETE_LOGS'] === 'yes')) {?>
+      <? if (($_SESSION['userContext'] === 'user') && ($_SESSION['POLICY_USER_DELETE_LOGS'] === 'yes') || (!isset($_SESSION['POLICY_USER_DELETE_LOGS']))) {?>
         <div class="actions-panel display-inline-block" key-action="js">
           <a class="data-controls do_delete ui-button danger cancel">
             <i class="do_delete fas fa-times-circle status-icon red"></i><?=_('Delete')?>