]> git.proxmox.com Git - pve-manager.git/commitdiff
projects / pve-manager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 25e0bc2)
Serve debug versions of ExtJS libs when pveproxy is started in debug mode
authorEmmanuel Kasper <e.kasper@proxmox.com>
Tue, 3 May 2016 11:40:56 +0000 (13:40 +0200)
committerDietmar Maurer <dietmar@proxmox.com>
Wed, 4 May 2016 06:12:19 +0000 (08:12 +0200)
PVE/ExtJSIndex.pm patch | blob | blame | history
PVE/Service/pveproxy.pm patch | blob | blame | history

diff --git a/PVE/ExtJSIndex.pm b/PVE/ExtJSIndex.pm
index fae3546c5d8d0db577179a09e492d565e02c478e..9683148654cfba1613f63e41d6a2d09cc8829cb2 100644 (file)
--- a/PVE/ExtJSIndex.pm
+++ b/PVE/ExtJSIndex.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 sub get_index {
-    my ($lang, $username, $csrftoken, $console, $nodename) = @_;
+    my ($lang, $username, $csrftoken, $console, $nodename, $debug) = @_;
 
     my $page = <<_EOD;
 <!DOCTYPE html>
@@ -26,9 +26,19 @@ _EOD
        $page .= '<script type="text/javascript">function gettext(buf) { return buf; }</script>';
     }
 
-    $page .= <<_EOD;
+    if ($debug) {
+       $page .= <<_EOD;
+    <script type="text/javascript" src="/pve2/ext6/ext-all-debug.js"></script>
+    <script type="text/javascript" src="/pve2/ext6/charts-debug.js"></script>
+_EOD
+    } else {
+       $page .= <<_EOD;
     <script type="text/javascript" src="/pve2/ext6/ext-all.js"></script>
     <script type="text/javascript" src="/pve2/ext6/charts.js"></script>
+_EOD
+    }
+
+$page .= <<_EOD;
     <script type="text/javascript" src="/pve2/ext6/pvemanagerlib.js"></script>
     <script type="text/javascript" src="/pve2/ext6/locale/locale-${lang}.js"></script>
 _EOD
diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm
index eaea87df326cbcd2f4cbef4c95cdae222f534216..9ed653bca63d78b230b0b7cc1197e949f7b5cdd3 100755 (executable)
--- a/PVE/Service/pveproxy.pm
+++ b/PVE/Service/pveproxy.pm
@@ -201,7 +201,8 @@ sub get_index {
     } elsif ($mobile) {
        $page = PVE::TouchIndex::get_index($lang, $username, $token, $args->{console}, $nodename);
     } else {
-       $page = PVE::ExtJSIndex::get_index($lang, $username, $token, $args->{console}, $nodename);
+       $page = PVE::ExtJSIndex::get_index($lang, $username, $token, $args->{console}, $nodename,
+           $server->{debug});
     }
     my $headers = HTTP::Headers->new(Content_Type => "text/html; charset=utf-8");
     my $resp = HTTP::Response->new(200, "OK", $headers, $page);
The Proxmox VE Management API and Web UI