Skip to content
Snippets Groups Projects
Verified Commit 47ecadac authored by Gabriel Zachmann's avatar Gabriel Zachmann
Browse files

fix broken settings

parent 83a8ee20
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
internal/server/web/partials/grants.mustache
+ 37
− 51
View file @ 47ecadac
......@@ -22,65 +22,51 @@
<tr class="collapse no-top-border" id="settings-{{Name}}-body">
<td class="no-top-border"></td>
<td class="no-top-border" colspan="3">
<div>{{{EmbedBody}}}</div>
</td>
</tr>
<div class="modal fade" tabindex="-1" role="dialog" id="{{Name}}-grantEnableModal">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Enable {{DisplayName}}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">Confirm to enable the '{{DisplayName}}' Grant Type.</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary" data-dismiss="modal"
onclick="enableGrant('{{Name}}')">Enable
</button>
</div>
</div>
<div class="modal fade" tabindex="-1" role="dialog" id="{{Name}}-grantEnableModal">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Enable {{DisplayName}}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">Confirm to enable the '{{DisplayName}}' Grant Type.</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary" data-dismiss="modal"
onclick="enableGrant('{{Name}}')">Enable
</button>
</div>
</div>
</div>
</div>
<div class="modal fade" tabindex="-1" role="dialog" id="{{Name}}-grantDisableModal">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Disable {{DisplayName}}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">Confirm to disable the '{{DisplayName}}' Grant Type.</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary" data-dismiss="modal"
onclick="disableGrant('{{Name}}')">Disable
</button>
</div>
</div>
<div class="modal fade" tabindex="-1" role="dialog" id="{{Name}}-grantDisableModal">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Disable {{DisplayName}}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">Confirm to disable the '{{DisplayName}}' Grant Type.</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary" data-dismiss="modal"
onclick="disableGrant('{{Name}}')">Disable
</button>
</div>
</div>
</td>
</tr>
</div>
</div>
{{/grants}}
</tbody>
</table>
</div>
<div class="modal fade" tabindex="-1" role="dialog" id="error-modal">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content bg-danger">
<div class="modal-header">
<h5 class="modal-title">Error</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body" id="error-modal-msg"></div>
</div>
</div>
</div>
\ No newline at end of file
internal/server/web/sites/settings.mustache
+ 14
− 0
View file @ 47ecadac
......@@ -15,3 +15,17 @@
</div>
</div>
</div>
<div class="modal fade" tabindex="-1" role="dialog" id="settings-error-modal">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content bg-danger">
<div class="modal-header">
<h5 class="modal-title">Error</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body" id="settings-error-modal-msg"></div>
</div>
</div>
</div>
\ No newline at end of file
internal/server/web/static/js/settings-helper.js
+ 6
− 6
View file @ 47ecadac
const $errorModal = $('#error-modal')
const $errorModalMsg = $('#error-modal-msg')
const $settingsErrorModal = $('#settings-error-modal')
const $settingsErrorModalMsg = $('#settings-error-modal-msg')
function useSettingsToken(callback) {
let tok = storageGet("settings_mytoken")
......@@ -29,8 +29,8 @@ function useSettingsToken(callback) {
callback(token);
},
function (errRes) {
$errorModalMsg.text(getErrorMessage(errRes));
$errorModal.modal();
$settingsErrorModalMsg.text(getErrorMessage(errRes));
$settingsErrorModal.modal();
}
);
},
......@@ -54,8 +54,8 @@ function sendGrantRequest(grant, enable, okCallback) {
okCallback();
},
error: function (errRes) {
$errorModalMsg.text(getErrorMessage(errRes));
$errorModal.modal();
$settingsErrorModalMsg.text(getErrorMessage(errRes));
$settingsErrorModal.modal();
},
});
});
......
internal/server/web/static/js/settings.js
+ 3
− 3
View file @ 47ecadac
......@@ -22,15 +22,15 @@ function initGrants(...next) {
},
url: storageGet('usersettings_endpoint') + "/grants",
success: function (res) {
let grants = res['grant_types'];
let grants = res['grant_types'] || [];
grants.forEach(function (grant) {
$('#' + grant['grant_type'] + '-GrantEnable').prop('checked', grant['enabled']);
})
doNext(...next);
},
error: function (errRes) {
$errorModalMsg.text(getErrorMessage(errRes));
$errorModal.modal();
$settingsErrorModalMsg.text(getErrorMessage(errRes));
$settingsErrorModal.modal();
},
});
});
......
internal/server/web/static/js/ssh.js
+ 9
− 12
View file @ 47ecadac
......@@ -39,7 +39,8 @@ disableGrantCallbacks['ssh'] = function disableSSHCallback() {
};
function initSSH(...next) {
initRestrGUI();
initRestr();
initCapabilities();
clearSSHKeyTable();
useSettingsToken(function (token) {
$.ajax({
......@@ -65,8 +66,8 @@ function initSSH(...next) {
doNext(...next);
},
error: function (errRes) {
$errorModalMsg.text(getErrorMessage(errRes));
$errorModal.modal();
$settingsErrorModalMsg.text(getErrorMessage(errRes));
$settingsErrorModal.modal();
},
});
});
......@@ -113,13 +114,9 @@ function addSSHKey() {
"grant_type": "mytoken",
"ssh_key": $sshKeyInput.val(),
"name": $('#keyName').val(),
"restrictions": restrictions,
"capabilities": $('.capability-check:checked').map(function (_, el) {
return $(el).val();
}).get(),
"subtoken_capabilities": $('.subtoken-capability-check:checked').map(function (_, el) {
return $(el).val();
}).get()
"restrictions": getRestrictionsData(),
"capabilities": getCheckedCapabilities(),
"subtoken_capabilities": getCheckedSubtokenCapabilities()
};
data = JSON.stringify(data);
$.ajax({
......@@ -291,8 +288,8 @@ function sendDeleteKeyRequest(keyFP) {
initSSH();
},
error: function (errRes) {
$errorModalMsg.text(getErrorMessage(errRes));
$errorModal.modal();
$settingsErrorModalMsg.text(getErrorMessage(errRes));
$settingsErrorModal.modal();
},
});
});
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

A HIFIS Service | Privacy | Imprint | Support | Documentation | Changelog