Issue #2637: Tidied base entity and base reference drivers a bit.

RotherOSS · Nov 24, 2023 · 073be23 · 073be23
1 parent f63038d
commit 073be23
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 45 deletions.
diff --git a/Kernel/System/DynamicField/Driver/BaseEntity.pm b/Kernel/System/DynamicField/Driver/BaseEntity.pm
@@ -158,9 +158,11 @@ sub ValueValidate {
         @Values = ( $Param{Value} );
     }
 
+    # get dynamic field value object
+    my $DynamicFieldValueObject = $Kernel::OM->Get('Kernel::System::DynamicFieldValue');
     my $Success;
     for my $Value (@Values) {
-        $Success = $Kernel::OM->Get('Kernel::System::DynamicFieldValue')->ValueValidate(
+        $Success = $DynamicFieldValueObject->ValueValidate(
             Value => {
                 $ValueKey => $Value,
             },

diff --git a/Kernel/System/DynamicField/Driver/BaseReference.pm b/Kernel/System/DynamicField/Driver/BaseReference.pm
@@ -55,31 +55,8 @@ Store a reference to an object in an dynamic field. Object type specific feature
 This dynamic field driver module implements the public interface of L<Kernel::System::DynamicField::Backend>.
 Please look there for a detailed reference of the functions.
 
-=head2 ValueGet()
-
-This method contains special support for the case of Lenses. A Lens operates directly on dynamic field of an specific object.
-The specific object is usually identified by the value of the Reference dynamic field. But there is at least one special case.
-When the reference it to an C<ITSMConfigItem> then the relevant ID is the ID of the last version. This case is handled
-when the parameter C<ForLens> is passed. Then there is check whether there is a plugin object that provides
-the method C<ValueForLens>.
-
 =cut
 
-# TODO remove and overwrite in ITSMConfigItem(Version)Reference for lens stuff
-sub ValueGet {
-    my ( $Self, %Param ) = @_;
-
-    # get the value from the parent class
-    my $Value = $Self->SUPER::ValueGet(%Param);
-
-    # special handling only for Lens
-    return $Value unless $Param{ForLens};
-
-    # for usage in lenses we might have to interpret the values to be usable for their ValueGet()
-    return $Self->ValueForLens( Value => $Value ) if $Self->can('ValueForLens');
-    return $Value;
-}
-
 sub ValueValidate {
     my ( $Self, %Param ) = @_;
 
@@ -106,28 +83,28 @@ sub ValueValidate {
     }
 
     my $Success;
-    for my $Item (@Values) {
+    for my $Value (@Values) {
         $Success = $DynamicFieldValueObject->ValueValidate(
             Value => {
-                $Self->{ValueKey} => $Param{Value},
+                $Self->{ValueKey} => $Value,
             },
-            UserID => $Param{UserID}
+            UserID => $Param{UserID},
         );
 
         return if !$Success;
 
-        if ( $CheckRegex && IsStringWithData($Item) ) {
+        if ( $CheckRegex && IsStringWithData($Value) ) {
 
             # check regular expressions
             my @RegExList = @{ $Param{DynamicFieldConfig}->{Config}->{RegExList} };
 
             REGEXENTRY:
             for my $RegEx (@RegExList) {
 
-                if ( $Item !~ $RegEx->{Value} ) {
+                if ( $Value !~ $RegEx->{Value} ) {
                     $Kernel::OM->Get('Kernel::System::Log')->Log(
                         Priority => 'error',
-                        Message  => "The value '$Item' is not matching /"
+                        Message  => "The value '$Value' is not matching /"
                             . $RegEx->{Value} . "/ ("
                             . $RegEx->{ErrorMessage} . ")!",
                     );
@@ -315,8 +292,6 @@ sub EditFieldRender {
         ServerError => $Param{ServerError},
         Mandatory   => $Param{Mandatory},
     );
-
-    # for getting descriptive names for the values, e.g. TicketNumber for TicketID
     my @ResultHTML;
     for my $ValueIndex ( 0 .. ( $DFDetails->{Multiselect} ? 0 : $#{$Value} ) ) {
         my $FieldID = $DFDetails->{MultiValue} ? $FieldName . '_' . $ValueIndex : $FieldName;
@@ -432,19 +407,6 @@ EOF
     return \%Data;
 }
 
-sub EditFieldValueGet {
-    my ( $Self, %Param ) = @_;
-
-    # get the value from the parent class
-    my $Value = $Self->SUPER::EditFieldValueGet(%Param);
-
-    # for this field the normal return an the ReturnValueStructure are the same
-    return $Value unless $Param{ForLens};
-
-    # for usage in lenses we might have to interpret the values to be usable for their ValueGet()
-    return $Self->can('ValueForLens') ? $Self->ValueForLens( Value => $Value ) : $Value;
-}
-
 sub EditFieldValueValidate {
     my ( $Self, %Param ) = @_;