diff --git a/obp-api/src/main/scala/code/api/constant/constant.scala b/obp-api/src/main/scala/code/api/constant/constant.scala index 8e4cf7952..c47493fbe 100644 --- a/obp-api/src/main/scala/code/api/constant/constant.scala +++ b/obp-api/src/main/scala/code/api/constant/constant.scala @@ -128,99 +128,99 @@ object Constant extends MdcLoggable { final val GET_STATIC_RESOURCE_DOCS_TTL: Int = APIUtil.getPropsValue(s"staticResourceDocsObp.cache.ttl.seconds", "3600").toInt final val SHOW_USED_CONNECTOR_METHODS: Boolean = APIUtil.getPropsAsBoolValue(s"show_used_connector_methods", false) - final val CAN_SEE_TRANSACTION_OTHER_BANK_ACCOUNT = "canSeeTransactionOtherBankAccount" - final val CAN_SEE_TRANSACTION_METADATA = "canSeeTransactionMetadata" - final val CAN_SEE_TRANSACTION_DESCRIPTION = "canSeeTransactionDescription" - final val CAN_SEE_TRANSACTION_AMOUNT = "canSeeTransactionAmount" - final val CAN_SEE_TRANSACTION_TYPE = "canSeeTransactionType" - final val CAN_SEE_TRANSACTION_CURRENCY = "canSeeTransactionCurrency" - final val CAN_SEE_TRANSACTION_START_DATE = "canSeeTransactionStartDate" - final val CAN_SEE_TRANSACTION_FINISH_DATE = "canSeeTransactionFinishDate" - final val CAN_SEE_TRANSACTION_BALANCE = "canSeeTransactionBalance" - final val CAN_SEE_COMMENTS = "canSeeComments" - final val CAN_SEE_OWNER_COMMENT = "canSeeOwnerComment" - final val CAN_SEE_TAGS = "canSeeTags" - final val CAN_SEE_IMAGES = "canSeeImages" - final val CAN_SEE_BANK_ACCOUNT_OWNERS = "canSeeBankAccountOwners" - final val CAN_SEE_BANK_ACCOUNT_TYPE = "canSeeBankAccountType" - final val CAN_SEE_BANK_ACCOUNT_BALANCE = "canSeeBankAccountBalance" - final val CAN_QUERY_AVAILABLE_FUNDS = "canQueryAvailableFunds" - final val CAN_SEE_BANK_ACCOUNT_LABEL = "canSeeBankAccountLabel" - final val CAN_SEE_BANK_ACCOUNT_NATIONAL_IDENTIFIER = "canSeeBankAccountNationalIdentifier" - final val CAN_SEE_BANK_ACCOUNT_SWIFT_BIC = "canSeeBankAccountSwift_bic" - final val CAN_SEE_BANK_ACCOUNT_IBAN = "canSeeBankAccountIban" - final val CAN_SEE_BANK_ACCOUNT_NUMBER = "canSeeBankAccountNumber" - final val CAN_SEE_BANK_ACCOUNT_BANK_NAME = "canSeeBankAccountBankName" - final val CAN_SEE_BANK_ACCOUNT_BANK_PERMALINK = "canSeeBankAccountBankPermalink" - final val CAN_SEE_BANK_ROUTING_SCHEME = "canSeeBankRoutingScheme" - final val CAN_SEE_BANK_ROUTING_ADDRESS = "canSeeBankRoutingAddress" - final val CAN_SEE_BANK_ACCOUNT_ROUTING_SCHEME = "canSeeBankAccountRoutingScheme" - final val CAN_SEE_BANK_ACCOUNT_ROUTING_ADDRESS = "canSeeBankAccountRoutingAddress" - final val CAN_SEE_OTHER_ACCOUNT_NATIONAL_IDENTIFIER = "canSeeOtherAccountNationalIdentifier" - final val CAN_SEE_OTHER_ACCOUNT_SWIFT_BIC = "canSeeOtherAccountSWIFT_BIC" - final val CAN_SEE_OTHER_ACCOUNT_IBAN = "canSeeOtherAccountIBAN" - final val CAN_SEE_OTHER_ACCOUNT_BANK_NAME = "canSeeOtherAccountBankName" - final val CAN_SEE_OTHER_ACCOUNT_NUMBER = "canSeeOtherAccountNumber" - final val CAN_SEE_OTHER_ACCOUNT_METADATA = "canSeeOtherAccountMetadata" - final val CAN_SEE_OTHER_ACCOUNT_KIND = "canSeeOtherAccountKind" - final val CAN_SEE_OTHER_BANK_ROUTING_SCHEME = "canSeeOtherBankRoutingScheme" - final val CAN_SEE_OTHER_BANK_ROUTING_ADDRESS = "canSeeOtherBankRoutingAddress" - final val CAN_SEE_OTHER_ACCOUNT_ROUTING_SCHEME = "canSeeOtherAccountRoutingScheme" - final val CAN_SEE_OTHER_ACCOUNT_ROUTING_ADDRESS = "canSeeOtherAccountRoutingAddress" - final val CAN_SEE_MORE_INFO = "canSeeMoreInfo" - final val CAN_SEE_URL = "canSeeUrl" - final val CAN_SEE_IMAGE_URL = "canSeeImageUrl" - final val CAN_SEE_OPEN_CORPORATES_URL = "canSeeOpenCorporatesUrl" - final val CAN_SEE_CORPORATE_LOCATION = "canSeeCorporateLocation" - final val CAN_SEE_PHYSICAL_LOCATION = "canSeePhysicalLocation" - final val CAN_SEE_PUBLIC_ALIAS = "canSeePublicAlias" - final val CAN_SEE_PRIVATE_ALIAS = "canSeePrivateAlias" - final val CAN_ADD_MORE_INFO = "canAddMoreInfo" - final val CAN_ADD_URL = "canAddURL" - final val CAN_ADD_IMAGE_URL = "canAddImageURL" - final val CAN_ADD_OPEN_CORPORATES_URL = "canAddOpenCorporatesUrl" - final val CAN_ADD_CORPORATE_LOCATION = "canAddCorporateLocation" - final val CAN_ADD_PHYSICAL_LOCATION = "canAddPhysicalLocation" - final val CAN_ADD_PUBLIC_ALIAS = "canAddPublicAlias" - final val CAN_ADD_PRIVATE_ALIAS = "canAddPrivateAlias" - final val CAN_ADD_COUNTERPARTY = "canAddCounterparty" - final val CAN_GET_COUNTERPARTY = "canGetCounterparty" - final val CAN_DELETE_COUNTERPARTY = "canDeleteCounterparty" - final val CAN_DELETE_CORPORATE_LOCATION = "canDeleteCorporateLocation" - final val CAN_DELETE_PHYSICAL_LOCATION = "canDeletePhysicalLocation" - final val CAN_EDIT_OWNER_COMMENT = "canEditOwnerComment" - final val CAN_ADD_COMMENT = "canAddComment" - final val CAN_DELETE_COMMENT = "canDeleteComment" - final val CAN_ADD_TAG = "canAddTag" - final val CAN_DELETE_TAG = "canDeleteTag" - final val CAN_ADD_IMAGE = "canAddImage" - final val CAN_DELETE_IMAGE = "canDeleteImage" - final val CAN_ADD_WHERE_TAG = "canAddWhereTag" - final val CAN_SEE_WHERE_TAG = "canSeeWhereTag" - final val CAN_DELETE_WHERE_TAG = "canDeleteWhereTag" - final val CAN_ADD_TRANSACTION_REQUEST_TO_OWN_ACCOUNT = "canAddTransactionRequestToOwnAccount" - final val CAN_ADD_TRANSACTION_REQUEST_TO_ANY_ACCOUNT = "canAddTransactionRequestToAnyAccount" - final val CAN_SEE_BANK_ACCOUNT_CREDIT_LIMIT = "canSeeBankAccountCreditLimit" - final val CAN_CREATE_DIRECT_DEBIT = "canCreateDirectDebit" - final val CAN_CREATE_STANDING_ORDER = "canCreateStandingOrder" - final val CAN_REVOKE_ACCESS_TO_CUSTOM_VIEWS = "canRevokeAccessToCustomViews" - final val CAN_GRANT_ACCESS_TO_CUSTOM_VIEWS = "canGrantAccessToCustomViews" - final val CAN_SEE_TRANSACTION_REQUESTS = "canSeeTransactionRequests" - final val CAN_SEE_TRANSACTION_REQUEST_TYPES = "canSeeTransactionRequestTypes" - final val CAN_SEE_AVAILABLE_VIEWS_FOR_BANK_ACCOUNT = "canSeeAvailableViewsForBankAccount" - final val CAN_UPDATE_BANK_ACCOUNT_LABEL = "canUpdateBankAccountLabel" - final val CAN_CREATE_CUSTOM_VIEW = "canCreateCustomView" - final val CAN_DELETE_CUSTOM_VIEW = "canDeleteCustomView" - final val CAN_UPDATE_CUSTOM_VIEW = "canUpdateCustomView" - final val CAN_GET_CUSTOM_VIEW = "canGetCustomView" - final val CAN_SEE_VIEWS_WITH_PERMISSIONS_FOR_ALL_USERS = "canSeeViewsWithPermissionsForAllUsers" - final val CAN_SEE_VIEWS_WITH_PERMISSIONS_FOR_ONE_USER = "canSeeViewsWithPermissionsForOneUser" - final val CAN_SEE_TRANSACTION_THIS_BANK_ACCOUNT = "canSeeTransactionThisBankAccount" - final val CAN_SEE_TRANSACTION_STATUS = "canSeeTransactionStatus" - final val CAN_SEE_BANK_ACCOUNT_CURRENCY = "canSeeBankAccountCurrency" - final val CAN_ADD_TRANSACTION_REQUEST_TO_BENEFICIARY = "canAddTransactionRequestToBeneficiary" - final val CAN_GRANT_ACCESS_TO_VIEWS = "canGrantAccessToViews" - final val CAN_REVOKE_ACCESS_TO_VIEWS = "canRevokeAccessToViews" + final val CAN_SEE_TRANSACTION_OTHER_BANK_ACCOUNT = "can_see_transaction_other_bank_account" + final val CAN_SEE_TRANSACTION_METADATA = "can_see_transaction_metadata" + final val CAN_SEE_TRANSACTION_DESCRIPTION = "can_see_transaction_description" + final val CAN_SEE_TRANSACTION_AMOUNT = "can_see_transaction_amount" + final val CAN_SEE_TRANSACTION_TYPE = "can_see_transaction_type" + final val CAN_SEE_TRANSACTION_CURRENCY = "can_see_transaction_currency" + final val CAN_SEE_TRANSACTION_START_DATE = "can_see_transaction_start_date" + final val CAN_SEE_TRANSACTION_FINISH_DATE = "can_see_transaction_finish_date" + final val CAN_SEE_TRANSACTION_BALANCE = "can_see_transaction_balance" + final val CAN_SEE_COMMENTS = "can_see_comments" + final val CAN_SEE_OWNER_COMMENT = "can_see_owner_comment" + final val CAN_SEE_TAGS = "can_see_tags" + final val CAN_SEE_IMAGES = "can_see_images" + final val CAN_SEE_BANK_ACCOUNT_OWNERS = "can_see_bank_account_owners" + final val CAN_SEE_BANK_ACCOUNT_TYPE = "can_see_bank_account_type" + final val CAN_SEE_BANK_ACCOUNT_BALANCE = "can_see_bank_account_balance" + final val CAN_QUERY_AVAILABLE_FUNDS = "can_query_available_funds" + final val CAN_SEE_BANK_ACCOUNT_LABEL = "can_see_bank_account_label" + final val CAN_SEE_BANK_ACCOUNT_NATIONAL_IDENTIFIER = "can_see_bank_account_national_identifier" + final val CAN_SEE_BANK_ACCOUNT_SWIFT_BIC = "can_see_bank_account_swift_bic" + final val CAN_SEE_BANK_ACCOUNT_IBAN = "can_see_bank_account_iban" + final val CAN_SEE_BANK_ACCOUNT_NUMBER = "can_see_bank_account_number" + final val CAN_SEE_BANK_ACCOUNT_BANK_NAME = "can_see_bank_account_bank_name" + final val CAN_SEE_BANK_ACCOUNT_BANK_PERMALINK = "can_see_bank_account_bank_permalink" + final val CAN_SEE_BANK_ROUTING_SCHEME = "can_see_bank_routing_scheme" + final val CAN_SEE_BANK_ROUTING_ADDRESS = "can_see_bank_routing_address" + final val CAN_SEE_BANK_ACCOUNT_ROUTING_SCHEME = "can_see_bank_account_routing_scheme" + final val CAN_SEE_BANK_ACCOUNT_ROUTING_ADDRESS = "can_see_bank_account_routing_address" + final val CAN_SEE_OTHER_ACCOUNT_NATIONAL_IDENTIFIER = "can_see_other_account_national_identifier" + final val CAN_SEE_OTHER_ACCOUNT_SWIFT_BIC = "can_see_other_account_swift_bic" + final val CAN_SEE_OTHER_ACCOUNT_IBAN = "can_see_other_account_iban" + final val CAN_SEE_OTHER_ACCOUNT_BANK_NAME = "can_see_other_account_bank_name" + final val CAN_SEE_OTHER_ACCOUNT_NUMBER = "can_see_other_account_number" + final val CAN_SEE_OTHER_ACCOUNT_METADATA = "can_see_other_account_metadata" + final val CAN_SEE_OTHER_ACCOUNT_KIND = "can_see_other_account_kind" + final val CAN_SEE_OTHER_BANK_ROUTING_SCHEME = "can_see_other_bank_routing_scheme" + final val CAN_SEE_OTHER_BANK_ROUTING_ADDRESS = "can_see_other_bank_routing_address" + final val CAN_SEE_OTHER_ACCOUNT_ROUTING_SCHEME = "can_see_other_account_routing_scheme" + final val CAN_SEE_OTHER_ACCOUNT_ROUTING_ADDRESS = "can_see_other_account_routing_address" + final val CAN_SEE_MORE_INFO = "can_see_more_info" + final val CAN_SEE_URL = "can_see_url" + final val CAN_SEE_IMAGE_URL = "can_see_image_url" + final val CAN_SEE_OPEN_CORPORATES_URL = "can_see_open_corporates_url" + final val CAN_SEE_CORPORATE_LOCATION = "can_see_corporate_location" + final val CAN_SEE_PHYSICAL_LOCATION = "can_see_physical_location" + final val CAN_SEE_PUBLIC_ALIAS = "can_see_public_alias" + final val CAN_SEE_PRIVATE_ALIAS = "can_see_private_alias" + final val CAN_ADD_MORE_INFO = "can_add_more_info" + final val CAN_ADD_URL = "can_add_url" + final val CAN_ADD_IMAGE_URL = "can_add_image_url" + final val CAN_ADD_OPEN_CORPORATES_URL = "can_add_open_corporates_url" + final val CAN_ADD_CORPORATE_LOCATION = "can_add_corporate_location" + final val CAN_ADD_PHYSICAL_LOCATION = "can_add_physical_location" + final val CAN_ADD_PUBLIC_ALIAS = "can_add_public_alias" + final val CAN_ADD_PRIVATE_ALIAS = "can_add_private_alias" + final val CAN_ADD_COUNTERPARTY = "can_add_counterparty" + final val CAN_GET_COUNTERPARTY = "can_get_counterparty" + final val CAN_DELETE_COUNTERPARTY = "can_delete_counterparty" + final val CAN_DELETE_CORPORATE_LOCATION = "can_delete_corporate_location" + final val CAN_DELETE_PHYSICAL_LOCATION = "can_delete_physical_location" + final val CAN_EDIT_OWNER_COMMENT = "can_edit_owner_comment" + final val CAN_ADD_COMMENT = "can_add_comment" + final val CAN_DELETE_COMMENT = "can_delete_comment" + final val CAN_ADD_TAG = "can_add_tag" + final val CAN_DELETE_TAG = "can_delete_tag" + final val CAN_ADD_IMAGE = "can_add_image" + final val CAN_DELETE_IMAGE = "can_delete_image" + final val CAN_ADD_WHERE_TAG = "can_add_where_tag" + final val CAN_SEE_WHERE_TAG = "can_see_where_tag" + final val CAN_DELETE_WHERE_TAG = "can_delete_where_tag" + final val CAN_ADD_TRANSACTION_REQUEST_TO_OWN_ACCOUNT = "can_add_transaction_request_to_own_account" + final val CAN_ADD_TRANSACTION_REQUEST_TO_ANY_ACCOUNT = "can_add_transaction_request_to_any_account" + final val CAN_SEE_BANK_ACCOUNT_CREDIT_LIMIT = "can_see_bank_account_credit_limit" + final val CAN_CREATE_DIRECT_DEBIT = "can_create_direct_debit" + final val CAN_CREATE_STANDING_ORDER = "can_create_standing_order" + final val CAN_REVOKE_ACCESS_TO_CUSTOM_VIEWS = "can_revoke_access_to_custom_views" + final val CAN_GRANT_ACCESS_TO_CUSTOM_VIEWS = "can_grant_access_to_custom_views" + final val CAN_SEE_TRANSACTION_REQUESTS = "can_see_transaction_requests" + final val CAN_SEE_TRANSACTION_REQUEST_TYPES = "can_see_transaction_request_types" + final val CAN_SEE_AVAILABLE_VIEWS_FOR_BANK_ACCOUNT = "can_see_available_views_for_bank_account" + final val CAN_UPDATE_BANK_ACCOUNT_LABEL = "can_update_bank_account_label" + final val CAN_CREATE_CUSTOM_VIEW = "can_create_custom_view" + final val CAN_DELETE_CUSTOM_VIEW = "can_delete_custom_view" + final val CAN_UPDATE_CUSTOM_VIEW = "can_update_custom_view" + final val CAN_GET_CUSTOM_VIEW = "can_get_custom_view" + final val CAN_SEE_VIEWS_WITH_PERMISSIONS_FOR_ALL_USERS = "can_see_views_with_permissions_for_all_users" + final val CAN_SEE_VIEWS_WITH_PERMISSIONS_FOR_ONE_USER = "can_see_views_with_permissions_for_one_user" + final val CAN_SEE_TRANSACTION_THIS_BANK_ACCOUNT = "can_see_transaction_this_bank_account" + final val CAN_SEE_TRANSACTION_STATUS = "can_see_transaction_status" + final val CAN_SEE_BANK_ACCOUNT_CURRENCY = "can_see_bank_account_currency" + final val CAN_ADD_TRANSACTION_REQUEST_TO_BENEFICIARY = "can_add_transaction_request_to_beneficiary" + final val CAN_GRANT_ACCESS_TO_VIEWS = "can_grant_access_to_views" + final val CAN_REVOKE_ACCESS_TO_VIEWS = "can_revoke_access_to_views" final val VIEW_PERMISSION_NAMES = List( CAN_SEE_TRANSACTION_OTHER_BANK_ACCOUNT, diff --git a/obp-api/src/main/scala/code/views/MapperViews.scala b/obp-api/src/main/scala/code/views/MapperViews.scala index ffeab0c0e..6c6217dad 100644 --- a/obp-api/src/main/scala/code/views/MapperViews.scala +++ b/obp-api/src/main/scala/code/views/MapperViews.scala @@ -647,32 +647,32 @@ object MapperViews extends Views with MdcLoggable { // For the rest of the permissions, they are just boolean values. if (permissionName == CAN_REVOKE_ACCESS_TO_VIEWS || permissionName == CAN_GRANT_ACCESS_TO_VIEWS) { - val permissionValueFromViewdefinition = viewDefinition.getClass.getMethod(permissionName).invoke(viewDefinition).asInstanceOf[Option[List[String]]] + val permissionValueFromViewDefinition = viewDefinition.getClass.getMethod(StringHelpers.camelifyMethod(permissionName)).invoke(viewDefinition).asInstanceOf[Option[List[String]]] ViewPermission.findViewPermission(viewDefinition, permissionName) match { - // If the permission already exists in ViewPermission, but permissionValueFromViewdefinition is empty, we delete it. - case Full(permission) if permissionValueFromViewdefinition.isEmpty => + // If the permission already exists in ViewPermission, but permissionValueFromViewDefinition is empty, we delete it. + case Full(permission) if permissionValueFromViewDefinition.isEmpty => permission.delete_! - // If the permission already exists and permissionValueFromViewdefinition is defined, we update the metadata. - case Full(permission) if permissionValueFromViewdefinition.isDefined => - permission.metaData(permissionValueFromViewdefinition.get.mkString(",")).save + // If the permission already exists and permissionValueFromViewDefinition is defined, we update the metadata. + case Full(permission) if permissionValueFromViewDefinition.isDefined => + permission.metaData(permissionValueFromViewDefinition.get.mkString(",")).save //if the permission is not existing in ViewPermission,but it is defined in the viewDefinition, we create it. --systemView - case Empty if (viewDefinition.isSystem && permissionValueFromViewdefinition.isDefined) => + case Empty if (viewDefinition.isSystem && permissionValueFromViewDefinition.isDefined) => ViewPermission.create .bank_id(null) .account_id(null) .view_id(viewDefinition.viewId.value) .permission(permissionName) - .metaData(permissionValueFromViewdefinition.get.mkString(",")) + .metaData(permissionValueFromViewDefinition.get.mkString(",")) .save //if the permission is not existing in ViewPermission,but it is defined in the viewDefinition, we create it. --customView - case Empty if (!viewDefinition.isSystem && permissionValueFromViewdefinition.isDefined) => + case Empty if (!viewDefinition.isSystem && permissionValueFromViewDefinition.isDefined) => ViewPermission.create .bank_id(viewDefinition.bankId.value) .account_id(viewDefinition.accountId.value) .view_id(viewDefinition.viewId.value) .permission(permissionName) - .metaData(permissionValueFromViewdefinition.get.mkString(",")) + .metaData(permissionValueFromViewDefinition.get.mkString(",")) .save case _ => // This case should not happen, but if it does, we add an error log @@ -680,7 +680,7 @@ object MapperViews extends Views with MdcLoggable { } } else { // For the rest of the permissions, they are just boolean values. - val permissionValue = viewDefinition.getClass.getMethod(permissionName).invoke(viewDefinition).asInstanceOf[Boolean] + val permissionValue = viewDefinition.getClass.getMethod(StringHelpers.camelifyMethod(permissionName)).invoke(viewDefinition).asInstanceOf[Boolean] ViewPermission.findViewPermission(viewDefinition, permissionName) match { // If the permission already exists in ViewPermission, but permissionValueFromViewdefinition is false, we delete it. diff --git a/obp-api/src/main/scala/code/views/system/ViewDefinition.scala b/obp-api/src/main/scala/code/views/system/ViewDefinition.scala index 561ebde73..a5f7312b5 100644 --- a/obp-api/src/main/scala/code/views/system/ViewDefinition.scala +++ b/obp-api/src/main/scala/code/views/system/ViewDefinition.scala @@ -557,7 +557,7 @@ class ViewDefinition extends View with LongKeyedMapper[ViewDefinition] with Many def canSeeBankAccountLabel : Boolean = canSeeBankAccountLabel_.get def canUpdateBankAccountLabel : Boolean = canUpdateBankAccountLabel_.get def canSeeBankAccountNationalIdentifier : Boolean = canSeeBankAccountNationalIdentifier_.get - def canSeeBankAccountSwift_bic : Boolean = canSeeBankAccountSwift_bic_.get + def canSeeBankAccountSwiftBic : Boolean = canSeeBankAccountSwift_bic_.get def canSeeBankAccountIban : Boolean = canSeeBankAccountIban_.get def canSeeBankAccountNumber : Boolean = canSeeBankAccountNumber_.get def canSeeBankAccountBankName : Boolean = canSeeBankAccountBankName_.get @@ -571,8 +571,8 @@ class ViewDefinition extends View with LongKeyedMapper[ViewDefinition] with Many //other bank account fields def canSeeOtherAccountNationalIdentifier : Boolean = canSeeOtherAccountNationalIdentifier_.get - def canSeeOtherAccountSWIFT_BIC : Boolean = canSeeOtherAccountSWIFT_BIC_.get - def canSeeOtherAccountIBAN : Boolean = canSeeOtherAccountIBAN_.get + def canSeeOtherAccountSwiftBic : Boolean = canSeeOtherAccountSWIFT_BIC_.get + def canSeeOtherAccountIban : Boolean = canSeeOtherAccountIBAN_.get def canSeeOtherAccountBankName : Boolean = canSeeOtherAccountBankName_.get def canSeeOtherAccountNumber : Boolean = canSeeOtherAccountNumber_.get def canSeeOtherAccountMetadata : Boolean = canSeeOtherAccountMetadata_.get @@ -592,8 +592,8 @@ class ViewDefinition extends View with LongKeyedMapper[ViewDefinition] with Many def canSeePublicAlias : Boolean = canSeePublicAlias_.get def canSeePrivateAlias : Boolean = canSeePrivateAlias_.get def canAddMoreInfo : Boolean = canAddMoreInfo_.get - def canAddURL : Boolean = canAddURL_.get - def canAddImageURL : Boolean = canAddImageURL_.get + def canAddUrl : Boolean = canAddURL_.get + def canAddImageUrl : Boolean = canAddImageURL_.get def canAddOpenCorporatesUrl : Boolean = canAddOpenCorporatesUrl_.get def canAddCorporateLocation : Boolean = canAddCorporateLocation_.get def canAddPhysicalLocation : Boolean = canAddPhysicalLocation_.get diff --git a/obp-commons/src/main/scala/com/openbankproject/commons/model/ViewModel.scala b/obp-commons/src/main/scala/com/openbankproject/commons/model/ViewModel.scala index dba7e7bdc..0cb5ad0e7 100644 --- a/obp-commons/src/main/scala/com/openbankproject/commons/model/ViewModel.scala +++ b/obp-commons/src/main/scala/com/openbankproject/commons/model/ViewModel.scala @@ -317,7 +317,7 @@ trait View { def canSeeBankAccountNationalIdentifier: Boolean - def canSeeBankAccountSwift_bic: Boolean + def canSeeBankAccountSwiftBic: Boolean def canSeeBankAccountIban: Boolean @@ -340,9 +340,9 @@ trait View { //other bank account (counterparty) fields def canSeeOtherAccountNationalIdentifier: Boolean - def canSeeOtherAccountSWIFT_BIC: Boolean + def canSeeOtherAccountSwiftBic: Boolean - def canSeeOtherAccountIBAN: Boolean + def canSeeOtherAccountIban: Boolean def canSeeOtherAccountBankName: Boolean @@ -380,9 +380,9 @@ trait View { //other bank account (Counterparty) meta data - write def canAddMoreInfo: Boolean - def canAddURL: Boolean + def canAddUrl: Boolean - def canAddImageURL: Boolean + def canAddImageUrl: Boolean def canAddOpenCorporatesUrl: Boolean