From d271e74c07af3720a1f33eacd70dc88b38354b66 Mon Sep 17 00:00:00 2001 From: "p.ernst" <peter.ernst@salesagility.com> Date: Thu, 22 Feb 2018 10:26:16 +0000 Subject: [PATCH] Fix listview --- modules/OAuth2Clients/metadata/listviewdefs.php | 5 ++--- modules/OAuth2Clients/metadata/popupdefs.php | 11 ++++------- modules/OAuth2Clients/vardefs.php | 12 ++++++------ modules/OAuth2Tokens/vardefs.php | 2 +- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/modules/OAuth2Clients/metadata/listviewdefs.php b/modules/OAuth2Clients/metadata/listviewdefs.php index c274bcf841..77cb007d65 100644 --- a/modules/OAuth2Clients/metadata/listviewdefs.php +++ b/modules/OAuth2Clients/metadata/listviewdefs.php @@ -47,10 +47,9 @@ $listViewDefs[$module_name] = [ 'default' => true, 'link' => true, ], - 'redirect_url' => [ - 'label' => 'LBL_REDIRECT_URL', + 'grant_type' => [ + 'label' => 'LBL_ALLOWED_GRANT_TYPE', 'default' => true, - 'link' => true, ], 'is_confidential' => [ 'label' => 'LBL_IS_CONFIDENTIAL', diff --git a/modules/OAuth2Clients/metadata/popupdefs.php b/modules/OAuth2Clients/metadata/popupdefs.php index a0c202aaf9..79f42dee01 100755 --- a/modules/OAuth2Clients/metadata/popupdefs.php +++ b/modules/OAuth2Clients/metadata/popupdefs.php @@ -40,16 +40,13 @@ if (!defined('sugarEntry') || !sugarEntry) { die('Not A Valid Entry Point'); } -$module_name = 'OAuth2Clients'; -$table_name = 'oauth2clients'; - $popupMeta = [ - 'moduleMain' => $module_name, + 'moduleMain' => 'OAuth2Clients', 'varName' => 'OAUTH2CLIENTS', 'orderBy' => 'name', 'whereClauses' => [ - 'name' => $table_name . '.name', + 'name' => 'oauth2clients.name', ], 'searchInputs' => [ @@ -60,8 +57,8 @@ $popupMeta = [ 'label' => 'LBL_NAME', 'default' => true, ], - 'redirect_url' => [ - 'label' => 'LBL_REDIRECT_URL', + 'grant_type' => [ + 'label' => 'LBL_ALLOWED_GRANT_TYPE', 'default' => true, ], 'is_confidential' => [ diff --git a/modules/OAuth2Clients/vardefs.php b/modules/OAuth2Clients/vardefs.php index 514d8e2932..001d6569ac 100644 --- a/modules/OAuth2Clients/vardefs.php +++ b/modules/OAuth2Clients/vardefs.php @@ -127,7 +127,7 @@ $dictionary['OAuth2Clients'] = [ 'api-visible' => false, 'inline_edit' => false, ], - 'oauth2tokens' => array( + 'oauth2tokens' => [ 'name' => 'oauth2tokens', 'vname' => 'LBL_RELATED_OAUTH2TOKENS', 'type' => 'link', @@ -135,11 +135,11 @@ $dictionary['OAuth2Clients'] = [ 'module' => 'OAuth2Tokens', 'bean_name' => 'OAuth2Tokens', 'source' => 'non-db', - ), + ], ], 'optimistic_locking' => true, - 'relationships' => array( - 'oauth2clients_oauth2tokens' => array( + 'relationships' => [ + 'oauth2clients_oauth2tokens' => [ 'rhs_module' => 'OAuth2Tokens', 'rhs_table' => 'oauth2tokens', 'rhs_key' => 'client', @@ -147,8 +147,8 @@ $dictionary['OAuth2Clients'] = [ 'lhs_table' => 'oauth2clients', 'lhs_key' => 'id', 'relationship_type' => 'one-to-many', - ), - ), + ], + ], ]; if (!class_exists('VardefManager')) { require_once('include/SugarObjects/VardefManager.php'); diff --git a/modules/OAuth2Tokens/vardefs.php b/modules/OAuth2Tokens/vardefs.php index d5ff952843..33c6872f29 100644 --- a/modules/OAuth2Tokens/vardefs.php +++ b/modules/OAuth2Tokens/vardefs.php @@ -139,7 +139,7 @@ $dictionary['OAuth2Tokens'] = [ 'id_name' => 'client', 'vname' => 'LBL_CLIENT', 'type' => 'relate', - 'link' => 'client', + 'link' => 'oauth2clients', 'table' => 'oauth2clients', 'isnull' => 'true', 'module' => 'OAuth2Clients',