Skip to content

Commit

Permalink
Merge pull request #88 from lae/fix/subscription_patch
Browse files Browse the repository at this point in the history
Fix subscription patch for PVE 6.x
  • Loading branch information
lae authored Jan 18, 2020
2 parents b81be42 + d7cece8 commit 31caaa4
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 1 deletion.
41 changes: 41 additions & 0 deletions files/00_remove_checked_command_buster.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
diff -ur /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js
--- /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js 2019-12-17 11:02:52.000000000 +0000
+++ /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js 2020-01-18 16:29:37.362953621 +0000
@@ -6016,7 +6016,7 @@
var update_btn = new Ext.Button({
text: gettext('Refresh'),
handler: function() {
- Proxmox.Utils.checked_command(function() { apt_command('update'); });
+ apt_command('update');
}
});

diff -ur /usr/share/pve-manager/js/pvemanagerlib.js /usr/share/pve-manager/js/pvemanagerlib.js
--- /usr/share/pve-manager/js/pvemanagerlib.js 2019-12-16 14:12:19.000000000 +0000
+++ /usr/share/pve-manager/js/pvemanagerlib.js 2020-01-18 16:26:07.187536513 +0000
@@ -19024,7 +19024,7 @@
var version_btn = new Ext.Button({
text: gettext('Package versions'),
handler: function(){
- Proxmox.Utils.checked_command(function() { me.showVersions(); });
+ me.showVersions();
}
});

@@ -19288,7 +19288,7 @@
{
text: gettext('System Report'),
handler: function() {
- Proxmox.Utils.checked_command(function (){ me.showReport(); });
+ me.showReport();
}
}
],
@@ -40472,7 +40472,6 @@
handler: function(data) {
me.login = null;
me.updateLoginData(data);
- Proxmox.Utils.checked_command(function() {}); // display subscription status
}
});
}
File renamed without changes.
2 changes: 1 addition & 1 deletion tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@

- name: Remove subscription check wrapper function in web UI
patch:
src: "00_remove_checked_command.patch"
src: "00_remove_checked_command_{{ ansible_distribution_release }}.patch"
basedir: /
strip: 1
backup: yes
Expand Down

0 comments on commit 31caaa4

Please sign in to comment.