Skip to content

Commit 31caaa4

Browse files
authored
Merge pull request #88 from lae/fix/subscription_patch
Fix subscription patch for PVE 6.x
2 parents b81be42 + d7cece8 commit 31caaa4

File tree

3 files changed

+42
-1
lines changed

3 files changed

+42
-1
lines changed
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
diff -ur /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js
2+
--- /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js 2019-12-17 11:02:52.000000000 +0000
3+
+++ /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js 2020-01-18 16:29:37.362953621 +0000
4+
@@ -6016,7 +6016,7 @@
5+
var update_btn = new Ext.Button({
6+
text: gettext('Refresh'),
7+
handler: function() {
8+
- Proxmox.Utils.checked_command(function() { apt_command('update'); });
9+
+ apt_command('update');
10+
}
11+
});
12+
13+
diff -ur /usr/share/pve-manager/js/pvemanagerlib.js /usr/share/pve-manager/js/pvemanagerlib.js
14+
--- /usr/share/pve-manager/js/pvemanagerlib.js 2019-12-16 14:12:19.000000000 +0000
15+
+++ /usr/share/pve-manager/js/pvemanagerlib.js 2020-01-18 16:26:07.187536513 +0000
16+
@@ -19024,7 +19024,7 @@
17+
var version_btn = new Ext.Button({
18+
text: gettext('Package versions'),
19+
handler: function(){
20+
- Proxmox.Utils.checked_command(function() { me.showVersions(); });
21+
+ me.showVersions();
22+
}
23+
});
24+
25+
@@ -19288,7 +19288,7 @@
26+
{
27+
text: gettext('System Report'),
28+
handler: function() {
29+
- Proxmox.Utils.checked_command(function (){ me.showReport(); });
30+
+ me.showReport();
31+
}
32+
}
33+
],
34+
@@ -40472,7 +40472,6 @@
35+
handler: function(data) {
36+
me.login = null;
37+
me.updateLoginData(data);
38+
- Proxmox.Utils.checked_command(function() {}); // display subscription status
39+
}
40+
});
41+
}
File renamed without changes.

tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146

147147
- name: Remove subscription check wrapper function in web UI
148148
patch:
149-
src: "00_remove_checked_command.patch"
149+
src: "00_remove_checked_command_{{ ansible_distribution_release }}.patch"
150150
basedir: /
151151
strip: 1
152152
backup: yes

0 commit comments

Comments
 (0)