Revert "Add title and print_width fields to properties"

This reverts commit bcf4eb3d4960aa2b3d1e63c482fc35b83bab2c0a.
I think those titles does not add any value.

diff --git a/PVE/API2/ACL.pm b/PVE/API2/ACL.pm
index 866e0237459541ad6c9b246c1cd12eb22f27d21d..3e42ac06d8a9a85131a00fc62b6a02997689203d 100644 (file)
--- a/PVE/API2/ACL.pm
+++ b/PVE/API2/ACL.pm
@@ -17,13 +17,11 @@ use base qw(PVE::RESTHandler);
 register_standard_option('acl-propagate', {
     description => "Allow to propagate (inherit) permissions.",
     type => 'boolean',
 register_standard_option('acl-propagate', {
     description => "Allow to propagate (inherit) permissions.",
     type => 'boolean',

-    title => 'Propagate',

     optional => 1,
     default => 1,
 });
 register_standard_option('acl-path', {
     description => "Access control path",
     optional => 1,
     default => 1,
 });
 register_standard_option('acl-path', {
     description => "Access control path",

-    title => 'Path',

     type => 'string',
 });
 
     type => 'string',
 });
 


@@ -48,9 +46,9 @@ __PACKAGE__->register_method ({
            properties => {
                propagate => get_standard_option('acl-propagate'),
                path => get_standard_option('acl-path'),
            properties => {
                propagate => get_standard_option('acl-propagate'),
                path => get_standard_option('acl-path'),

-               type => { type => 'string', title => 'Type', enum => ['user', 'group'] },
-               ugid => { type => 'string', title => 'ID' },
-               roleid => { type => 'string', title => 'Role' },
+               type => { type => 'string', enum => ['user', 'group'] },
+               ugid => { type => 'string' },
+               roleid => { type => 'string' },

            },
        },
     },
            },
        },
     },

diff --git a/PVE/API2/Group.pm b/PVE/API2/Group.pm
index 1d6ba98bf605da4a3004bb9aae850358d1af7bd3..37f8be24645e204e11dc012d1feb798ac8184cd1 100644 (file)
--- a/PVE/API2/Group.pm
+++ b/PVE/API2/Group.pm
@@ -13,7 +13,6 @@ use base qw(PVE::RESTHandler);
 register_standard_option('group-id', {
     type => 'string',
     format => 'pve-groupid',
 register_standard_option('group-id', {
     type => 'string',
     format => 'pve-groupid',

-    title => 'Group ID' ,

     completion => \&PVE::AccessControl::complete_group,
 });
 
     completion => \&PVE::AccessControl::complete_group,
 });
 

diff --git a/PVE/API2/Role.pm b/PVE/API2/Role.pm
index 156d3b89bc4015060ae851bd180bd10a7ce2c394..80959b0a26d65d8eedac8aa070ecac05a8b18f48 100644 (file)
--- a/PVE/API2/Role.pm
+++ b/PVE/API2/Role.pm
@@ -15,13 +15,11 @@ use base qw(PVE::RESTHandler);
 register_standard_option('role-id', {
     type => 'string',
     format => 'pve-roleid',
 register_standard_option('role-id', {
     type => 'string',
     format => 'pve-roleid',

-    title => 'Role ID',
-    print_width => 30

 });
 register_standard_option('role-privs', {
     type => 'string' ,
     format => 'pve-priv-list',
 });
 register_standard_option('role-privs', {
     type => 'string' ,
     format => 'pve-priv-list',

-    optional => 1, title => 'Privileges',
+    optional => 1,

 });
 
 __PACKAGE__->register_method ({
 });
 
 __PACKAGE__->register_method ({


@@ -43,7 +41,7 @@ __PACKAGE__->register_method ({
            properties => {
                roleid => get_standard_option('role-id'),
                privs =>  get_standard_option('role-privs'),
            properties => {
                roleid => get_standard_option('role-id'),
                privs =>  get_standard_option('role-privs'),

-               special => { type => 'boolean', optional => 1, default => 0, title => 'Built-In' },
+               special => { type => 'boolean', optional => 1, default => 0 },

            },
        },
        links => [ { rel => 'child', href => "{roleid}" } ],
            },
        },
        links => [ { rel => 'child', href => "{roleid}" } ],

diff --git a/PVE/API2/User.pm b/PVE/API2/User.pm
index 89c83430165e1ce84b2dbe051b48cae0c8c06d63..4c859dc2e66081055a3450528a9a52729081d1e6 100644 (file)
--- a/PVE/API2/User.pm
+++ b/PVE/API2/User.pm
@@ -15,7 +15,6 @@ use PVE::RESTHandler;
 use base qw(PVE::RESTHandler);
 
 register_standard_option('user-enable', {
 use base qw(PVE::RESTHandler);
 
 register_standard_option('user-enable', {

-    title => "Enable",

     description => "Enable the account (default). You can set this to '0' to disable the account",
     type => 'boolean',
     optional => 1,
     description => "Enable the account (default). You can set this to '0' to disable the account",
     type => 'boolean',
     optional => 1,

diff --git a/PVE/Auth/Plugin.pm b/PVE/Auth/Plugin.pm
index 0bffa2b123144a415c0beb2d724190dcd014598e..d5d2c06971357b57bd15937f4a641608efbfe958 100755 (executable)
--- a/PVE/Auth/Plugin.pm
+++ b/PVE/Auth/Plugin.pm
@@ -76,7 +76,7 @@ sub verify_username {
 }
 
 PVE::JSONSchema::register_standard_option('userid', {
 }
 
 PVE::JSONSchema::register_standard_option('userid', {

-    description => "User ID", title => "User ID",
+    description => "User ID",

     type => 'string', format => 'pve-userid',
     maxLength => 64,
 });
     type => 'string', format => 'pve-userid',
     maxLength => 64,
 });