update to pve-manager 2.0-20

Display new permission syntax.

diff --git a/Makefile b/Makefile
index aa143983e71e8f4dedfc3e5e8fe7561b0c3ff977..c1728ef370410f710cc35eaa8fc5533540040de4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=2.0
 
 VERSION=2.0
-PKGREL=18
+PKGREL=20
 
 PACKAGE=pve2-api-doc
 

diff --git a/data/PVEAPI.js b/data/PVEAPI.js
index 664878cfae66f477895170a16d4ad4e9a243c762..0ce315bddb88be9e7a77ef53d9ae7c814c963e5c 100644 (file)
--- a/data/PVEAPI.js
+++ b/data/PVEAPI.js
@@ -85,7 +85,7 @@ Ext.onReady(function() {
     var render_docu = function(data) {
        var md = data.info;
 
-       console.log(data);
+       // console.dir(data);
 
        var items = [];
 
@@ -181,23 +181,27 @@ Ext.onReady(function() {
                var permhtml = '';
                if (!info.permissions) {
                    permhtml = "Root only.";
-               } else if (info.permissions.user) {
-                   if (info.permissions.user === 'world') {
-                       permhtml += "Accessible without any authententification.";
-                   } else if (info.permissions.user === 'all') {
-                       permhtml += "Accessible by all authententicated users.";
+               } else {
+                   if (info.permissions.description) {
+                       permhtml += "<div style='white-space:pre-wrap;padding-bottom:10px;'>" +
+                           Ext.htmlEncode(info.permissions.description) + "</div>";
+                   }
+
+                   if (info.permissions.user) {
+                       if (info.permissions.user === 'world') {
+                           permhtml += "Accessible without any authententification.";
+                       } else if (info.permissions.user === 'all') {
+                           permhtml += "Accessible by all authententicated users.";
+                       } else {
+                           permhtml += 'Onyl accessible by user "' + 
+                               info.permissions.user + '"';
+                       }
+                   } else if (info.permissions.check) {
+                       permhtml += "<pre>Check: " + 
+                           Ext.htmlEncode(Ext.JSON.encode(info.permissions.check))  + "</pre>";
                    } else {
-                       permhtml += 'Onyl accessible by user "' + 
-                           info.permissions.user + '"';
+                       permhtml += "Unknown systax!";
                    }
-               } else if (info.permissions.path && info.permissions.privs) {
-                   permhtml += '<table><tr><td>Path:</td><td>' + 
-                       info.permissions.path + '</td></tr>' +
-                       '<tr><td style="padding-right:10px;">Permissions:</td><td>' + 
-                       info.permissions.privs.join(' ') + 
-                       '</td></tr></table>';
-               } else {
-                   permhtml += "Root only.";
                }
 
                sections.push({

diff --git a/debian/changelog b/debian/changelog
index ea95f8def7009417b19d1dfe0922e8398f9a967d..7b3df3f3308c75b5bfcdb52bfc28fb8c3b402b51 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pve2-api-doc (2.0-20) unstable; urgency=low
+
+  * update to pve-manager 2.0-20
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 23 Jan 2012 12:21:42 +0100
+
 pve2-api-doc (2.0-18) unstable; urgency=low
 
   * update to pve-manager 2.0-18

diff --git a/debian/control b/debian/control
index 6895156d3f5d6e40f316ff5089be81b6dc6999ba..55345ff031fb31364d83b13e16eea3f93f390177 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: pve2-api-doc
 Section: doc
 Priority: extra
 Maintainer: Proxmox Support Team <support@proxmox.com>
-Build-Depends: debhelper (>= 7.0.50~), pve-manager (= 2.0-18)
+Build-Depends: debhelper (>= 7.0.50~), pve-manager (= 2.0-20)
 Standards-Version: 3.8.4
 
 Package: pve2-api-doc