Issue #1449: Details Dialog fixed

RotherOSS · Feb 23, 2022 · b99f555 · b99f555
1 parent af388f7
commit b99f555
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Kernel/Modules/CustomerDynamicFieldDBDetails.pm b/Kernel/Modules/CustomerDynamicFieldDBDetails.pm
@@ -39,7 +39,7 @@ sub Run {
     my $LayoutObject = $Kernel::OM->Get('Kernel::Output::HTML::Layout');
 
     # get params
-    for my $Item (qw(DynamicFieldName ID)) {
+    for my $Item (qw(DynamicFieldName ID ActivityDialogID)) {
         $Param{$Item} = $Kernel::OM->Get('Kernel::System::Web::Request')->GetParam( Param => $Item );
     }
 
@@ -52,7 +52,12 @@ sub Run {
     }
 
     # get the pure DynamicField name without prefix
-    my $DynamicFieldName = substr( $Param{DynamicFieldName}, 13 );
+    my $DynamicFieldNameLong = substr( $Param{DynamicFieldName}, 13 );
+
+    my $DynamicFieldName = $DynamicFieldNameLong;
+    if ( defined $Param{ActivityDialogID} && $Param{ActivityDialogID} ) {
+        $DynamicFieldName = substr($DynamicFieldName, 0, index( $DynamicFieldName, '_' . $Param{ActivityDialogID} ) );
+    }
 
     # get the dynamic field value for the current ticket
     my $DynamicFieldConfig = $Kernel::OM->Get('Kernel::System::DynamicField')->DynamicFieldGet(
@@ -65,6 +70,7 @@ sub Run {
             DynamicFieldConfig => $DynamicFieldConfig,
         },
     );
+
     my $DynamicFieldDBObject = $Kernel::OM->Get('Kernel::System::DynamicFieldDB');
 
     # perform the search based on the given dynamic field config

diff --git a/var/httpd/htdocs/js/Core.Agent.DynamicFieldDBSearch.js b/var/httpd/htdocs/js/Core.Agent.DynamicFieldDBSearch.js
@@ -106,11 +106,10 @@ Core.Agent.DynamicFieldDBSearch = (function(TargetNS) {
             ActivityDialogID = '';
         }
 
-
         // detect the frontend interface we currently use
         if (Core.Config.Get('CGIHandle').indexOf('customer') > -1) {
             FrontendInterface = 'CustomerDynamicFieldDBDetails';
-            SearchIFrameURL = Core.Config.Get('CGIHandle') + '?Action=' + FrontendInterface + ';DynamicFieldName=' + Field + ';ID=' + IdentifierKey;
+            SearchIFrameURL = Core.Config.Get('CGIHandle') + '?Action=' + FrontendInterface + ';DynamicFieldName=' + Field + ';ID=' + IdentifierKey + ';ActivityDialogID=' + ActivityDialogID;
             SearchIFrameURL += SerializeData(Core.App.GetSessionInformation());
             SearchIFrame = '<iframe width="700px" height="500px" class="TextOption Customer" src="' + SearchIFrameURL + '"></iframe>';
         }