From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 3 Aug 2018 08:45:13 +0000 (+0200)
Subject: Revert "Add title and print_width fields to properties"
X-Git-Url: https://git.proxmox.com/?p=pve-access-control.git;a=commitdiff_plain;h=af5d7da7f10abf98a83a74c2a498c24a75aeeed0;ds=sidebyside

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 866e023..3e42ac0 100644
--- 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',
-    title => 'Propagate',
     optional => 1,
     default => 1,
 });
 register_standard_option('acl-path', {
     description => "Access control path",
-    title => 'Path',
     type => 'string',
 });
 
@@ -48,9 +46,9 @@ __PACKAGE__->register_method ({
 	    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 1d6ba98..37f8be2 100644
--- 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',
-    title => 'Group ID' ,
     completion => \&PVE::AccessControl::complete_group,
 });
 
diff --git a/PVE/API2/Role.pm b/PVE/API2/Role.pm
index 156d3b8..80959b0 100644
--- 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',
-    title => 'Role ID',
-    print_width => 30
 });
 register_standard_option('role-privs', {
     type => 'string' ,
     format => 'pve-priv-list',
-    optional => 1, title => 'Privileges',
+    optional => 1,
 });
 
 __PACKAGE__->register_method ({
@@ -43,7 +41,7 @@ __PACKAGE__->register_method ({
 	    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}" } ],
diff --git a/PVE/API2/User.pm b/PVE/API2/User.pm
index 89c8343..4c859dc 100644
--- 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', {
-    title => "Enable",
     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 0bffa2b..d5d2c06 100755
--- a/PVE/Auth/Plugin.pm
+++ b/PVE/Auth/Plugin.pm
@@ -76,7 +76,7 @@ sub verify_username {
 }
 
 PVE::JSONSchema::register_standard_option('userid', {
-    description => "User ID", title => "User ID",
+    description => "User ID",
     type => 'string', format => 'pve-userid',
     maxLength => 64,
 });