Prettified
hide buttons if someone has no permissions
This commit is contained in:
thelastWallE 2021-01-21 23:53:51 +01:00
parent 297554536c
commit b1a380a4bf
3 changed files with 160 additions and 129 deletions

View File

@ -57,6 +57,24 @@ ul#klipper-settings {
font-family: monospace; font-family: monospace;
} }
#tab_plugin_klipper_main .row-fluid {
display: flex;
flex-direction: row;
flex-wrap: wrap;
}
#tab_plugin_klipper_main .span8 {
min-width: 50%;
width: auto;
flex-grow: 6;
}
#tab_plugin_klipper_main .span4 {
flex-grow: 1;
flex-shrink: 1;
width: auto;
}
#settings_plugin_klipper { #settings_plugin_klipper {
height: 100%; height: 100%;
} }

View File

@ -26,47 +26,48 @@ $(function() {
self.shortStatus = ko.observable(); self.shortStatus = ko.observable();
self.logMessages = ko.observableArray(); self.logMessages = ko.observableArray();
self.hasRight = ko.observable(false);
self.showLevelingDialog = function () { self.showLevelingDialog = function () {
var dialog = $("#klipper_leveling_dialog"); var dialog = $("#klipper_leveling_dialog");
dialog.modal({ dialog.modal({
show: 'true', show: "true",
backdrop: 'static', backdrop: "static",
keyboard: false keyboard: false,
}); });
self.levelingViewModel.initView(); self.levelingViewModel.initView();
} };
self.showPidTuningDialog = function () { self.showPidTuningDialog = function () {
var dialog = $("#klipper_pid_tuning_dialog"); var dialog = $("#klipper_pid_tuning_dialog");
dialog.modal({ dialog.modal({
show: 'true', show: "true",
backdrop: 'static', backdrop: "static",
keyboard: false keyboard: false,
}); });
} };
self.showOffsetDialog = function () { self.showOffsetDialog = function () {
var dialog = $("#klipper_offset_dialog"); var dialog = $("#klipper_offset_dialog");
dialog.modal({ dialog.modal({
show: 'true', show: "true",
backdrop: 'static' backdrop: "static",
}); });
} };
self.showGraphDialog = function () { self.showGraphDialog = function () {
var dialog = $("#klipper_graph_dialog"); var dialog = $("#klipper_graph_dialog");
dialog.modal({ dialog.modal({
show: 'true', show: "true",
minHeight: "500px", minHeight: "500px",
maxHeight: "600px" maxHeight: "600px",
}); });
} };
self.executeMacro = function (macro) { self.executeMacro = function (macro) {
var paramObjRegex = /{(.*?)}/g; var paramObjRegex = /{(.*?)}/g;
if (!this.hasRight("MACROS")) return;
if (macro.macro().match(paramObjRegex) == null) { if (macro.macro().match(paramObjRegex) == null) {
OctoPrint.control.sendGcode( OctoPrint.control.sendGcode(
// Use .split to create an array of strings which is sent to // Use .split to create an array of strings which is sent to
@ -78,78 +79,86 @@ $(function() {
var dialog = $("#klipper_macro_dialog"); var dialog = $("#klipper_macro_dialog");
dialog.modal({ dialog.modal({
show: 'true', show: "true",
backdrop: 'static' backdrop: "static",
}); });
} }
} };
self.navbarClicked = function () { self.navbarClicked = function () {
$("#tab_plugin_klipper_main_link").find("a").click(); $("#tab_plugin_klipper_main_link").find("a").click();
} };
self.onGetStatus = function () { self.onGetStatus = function () {
OctoPrint.control.sendGcode("Status") OctoPrint.control.sendGcode("Status");
} };
self.onRestartFirmware = function () { self.onRestartFirmware = function () {
OctoPrint.control.sendGcode("FIRMWARE_RESTART") OctoPrint.control.sendGcode("FIRMWARE_RESTART");
}; };
self.onRestartHost = function () { self.onRestartHost = function () {
OctoPrint.control.sendGcode("RESTART") OctoPrint.control.sendGcode("RESTART");
}; };
self.onAfterBinding = function () { self.onAfterBinding = function () {
self.connectionState.selectedPort(self.settings.settings.plugins.klipper.connection.port()); self.connectionState.selectedPort(
} self.settings.settings.plugins.klipper.connection.port()
);
};
self.onDataUpdaterPluginMessage = function (plugin, message) { self.onDataUpdaterPluginMessage = function (plugin, message) {
if (plugin == "klipper") { if (plugin == "klipper") {
if (message["type"] == "status") { if (message["type"] == "status") {
self.shortStatus(message["payload"]); self.shortStatus(message["payload"]);
} else { } else {
self.logMessage(message["time"], message["subtype"], message["payload"]); self.logMessage(
} message["time"],
message["subtype"],
message["payload"]
);
} }
} }
};
self.logMessage = function (timestamp, type, message) { self.logMessage = function (timestamp, type, message) {
self.logMessages.push({ self.logMessages.push({
time: timestamp, time: timestamp,
type: type, type: type,
msg: message.replace(/\n/gi, "<br>")} msg: message.replace(/\n/gi, "<br>"),
); });
} };
self.onClearLog = function () { self.onClearLog = function () {
self.logMessages.removeAll(); self.logMessages.removeAll();
}; };
self.isActive = function () { self.isActive = function () {
return self.connectionState.isOperational() && self.loginState.hasPermission(self.access.permissions.PLUGIN_KLIPPER_CONFIG); //was: && self.loginState.isUser(); return self.connectionState.isOperational() && hasRight("CONFIG");
} };
self.hasRight = function (right_role) { self.hasRight = function (right_role, type) {
var arg = eval("access.permissions.PLUGIN_KLIPPER_"+right_role); var arg = eval(
"self.access.permissions.PLUGIN_KLIPPER_" + right_role
);
if (type == "Ko") {
return self.loginState.hasPermissionKo(arg); return self.loginState.hasPermissionKo(arg);
} }
return self.loginState.hasPermission(arg);
};
// OctoKlipper settings link // OctoKlipper settings link
self.openOctoKlipperSettings = function (profile_type) { self.openOctoKlipperSettings = function (profile_type) {
if (!this.hasRight("CONFIG")) return;
if ( $("a#navbar_show_settings").click();
!self.loginState.hasPermission( $("li#settings_plugin_klipper_link a").click();
self.access.permissions.PLUGIN_KLIPPER_CONFIG if (profile_type) {
) var query =
) "#klipper-settings a[data-profile-type='" +
return; profile_type +
"']";
$('a#navbar_show_settings').click();
$('li#settings_plugin_klipper_link a').click();
if(profile_type)
{
var query= "#klipper-settings a[data-profile-type='"+profile_type+"']";
$(query).click(); $(query).click();
} }
}; };
@ -163,8 +172,12 @@ $(function() {
"connectionViewModel", "connectionViewModel",
"klipperLevelingViewModel", "klipperLevelingViewModel",
"klipperMacroDialogViewModel", "klipperMacroDialogViewModel",
"accessViewModel" "accessViewModel",
],
elements: [
"#tab_plugin_klipper_main",
"#sidebar_plugin_klipper",
"#navbar_plugin_klipper",
], ],
elements: ["#tab_plugin_klipper_main", "#sidebar_plugin_klipper", "#navbar_plugin_klipper"]
}); });
}); });

View File

@ -5,7 +5,7 @@
<button class="btn btn-block" data-bind="click: connectionState.connect, text: connectionState.buttonText(), enable: loginState.isUser()">{{ _('Connect') }}</button> <button class="btn btn-block" data-bind="click: connectionState.connect, text: connectionState.buttonText(), enable: loginState.isUser()">{{ _('Connect') }}</button>
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group" data-bind="visible: hasRight('MACRO', 'Ko')">
<div class="controls"> <div class="controls">
<button class="btn btn-block" data-bind="visible: loginState.hasPermissionKo(access.permissions.PLUGIN_KLIPPER_CONFIG), click: function() {openOctoKlipperSettings('klipper-config');}">{{ _('Open Klipper config') }}</button> <button class="btn btn-block" data-bind="visible: loginState.hasPermissionKo(access.permissions.PLUGIN_KLIPPER_CONFIG), click: function() {openOctoKlipperSettings('klipper-config');}">{{ _('Open Klipper config') }}</button>
</div> </div>