]> git.proxmox.com Git - pve2-api-doc.git/commitdiff
only add default description if there is no other description.
authorDietmar Maurer <dietmar@proxmox.com>
Thu, 23 Feb 2012 06:16:15 +0000 (07:16 +0100)
committerDietmar Maurer <dietmar@proxmox.com>
Thu, 23 Feb 2012 06:16:15 +0000 (07:16 +0100)
data/PVEAPI.js
data/PVETable.js

index 64586a46a70cfa097ba5d58cdbeeb5899e0f5c55..58d15acea4f97099772e4b02e3cd81978a2d1925 100644 (file)
@@ -188,13 +188,15 @@ Ext.onReady(function() {
                    }
 
                    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 + '"';
+                       if (!info.permissions.description) {
+                           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: " + 
index 1b52f7bcdba3237189e0042e22675f558bfe9328..2a6b4587fc7bc9f6622332b822cffcb2829c21f8 100644 (file)
@@ -19,7 +19,6 @@ Ext.define('PVE.Table', {
            rows.push(record.data);
        });
 
        me.renderData.rows = rows;
        me.callParent(arguments);
     },
@@ -30,7 +29,7 @@ Ext.define('PVE.Table', {
        '</tpl>'+ 
        '</tr>',
 
-     metaRenderTpl: '<h1>{title}</h1>' +
+    metaRenderTpl: '<h1>{title}</h1>' +
        '<table border="1" cellspacing="0" cellpadding="0">' +
        '<tr><tpl for="columns">' +
        '<th><div id="{parent.id}-th-resize{#}" style="background-color:red;">{header}</div></th>' +