Issue #3035: Remove field order from pre-filled params.

RotherOSS · Feb 23, 2024 · 88e42ff · 88e42ff
1 parent 943460b
commit 88e42ff
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 14 deletions.
diff --git a/Kernel/Modules/AdminDynamicFieldCheckbox.pm b/Kernel/Modules/AdminDynamicFieldCheckbox.pm
@@ -97,7 +97,7 @@ sub _Add {
         if ( IsHashRefWithData($FieldConfig) ) {
 
             # copy standard stuff
-            for my $Key (qw(ObjectType FieldType FieldOrder Label Name ValidID)) {
+            for my $Key (qw(ObjectType FieldType Label Name ValidID)) {
                 $GetParam{$Key} = $FieldConfig->{$Key};
             }
 

diff --git a/Kernel/Modules/AdminDynamicFieldContactWD.pm b/Kernel/Modules/AdminDynamicFieldContactWD.pm
@@ -102,7 +102,7 @@ sub _Add {
         if ( IsHashRefWithData($FieldConfig) ) {
 
             # copy standard stuff
-            for my $Key (qw(ObjectType FieldType FieldOrder Label Name ValidID)) {
+            for my $Key (qw(ObjectType FieldType Label Name ValidID)) {
                 $GetParam{$Key} = $FieldConfig->{$Key};
             }
 

diff --git a/Kernel/Modules/AdminDynamicFieldDB.pm b/Kernel/Modules/AdminDynamicFieldDB.pm
@@ -97,7 +97,7 @@ sub _Add {
         if ( IsHashRefWithData($FieldConfig) ) {
 
             # copy standard stuff
-            for my $Key (qw(ObjectType FieldType FieldOrder Label Name ValidID)) {
+            for my $Key (qw(ObjectType FieldType Label Name ValidID)) {
                 $GetParam{$Key} = $FieldConfig->{$Key};
             }
 

diff --git a/Kernel/Modules/AdminDynamicFieldDateTime.pm b/Kernel/Modules/AdminDynamicFieldDateTime.pm
@@ -97,7 +97,7 @@ sub _Add {
         if ( IsHashRefWithData($FieldConfig) ) {
 
             # copy standard stuff
-            for my $Key (qw(ObjectType FieldType FieldOrder Label Name ValidID)) {
+            for my $Key (qw(ObjectType FieldType Label Name ValidID)) {
                 $GetParam{$Key} = $FieldConfig->{$Key};
             }
 

diff --git a/Kernel/Modules/AdminDynamicFieldDropdown.pm b/Kernel/Modules/AdminDynamicFieldDropdown.pm
@@ -102,7 +102,7 @@ sub _Add {
         if ( IsHashRefWithData($FieldConfig) ) {
 
             # copy standard stuff
-            for my $Key (qw(ObjectType FieldType FieldOrder Label Name ValidID)) {
+            for my $Key (qw(ObjectType FieldType Label Name ValidID)) {
                 $GetParam{$Key} = $FieldConfig->{$Key};
             }
 

diff --git a/Kernel/Modules/AdminDynamicFieldLens.pm b/Kernel/Modules/AdminDynamicFieldLens.pm
@@ -136,7 +136,7 @@ sub _Add {
         if ( IsHashRefWithData($FieldConfig) ) {
 
             # copy standard stuff
-            for my $Key (qw(ObjectType FieldType FieldOrder Label Name ValidID)) {
+            for my $Key (qw(ObjectType FieldType Label Name ValidID)) {
                 $GetParam{$Key} = $FieldConfig->{$Key};
             }
 

diff --git a/Kernel/Modules/AdminDynamicFieldMultiselect.pm b/Kernel/Modules/AdminDynamicFieldMultiselect.pm
@@ -102,7 +102,7 @@ sub _Add {
         if ( IsHashRefWithData($FieldConfig) ) {
 
             # copy standard stuff
-            for my $Key (qw(ObjectType FieldType FieldOrder Label Name ValidID)) {
+            for my $Key (qw(ObjectType FieldType Label Name ValidID)) {
                 $GetParam{$Key} = $FieldConfig->{$Key};
             }
 

diff --git a/Kernel/Modules/AdminDynamicFieldReference.pm b/Kernel/Modules/AdminDynamicFieldReference.pm
@@ -183,7 +183,7 @@ sub _Add {
         if ( IsHashRefWithData($FieldConfig) ) {
 
             # copy standard stuff
-            for my $Key (qw(ObjectType FieldType FieldOrder Label Name ValidID)) {
+            for my $Key (qw(ObjectType FieldType Label Name ValidID)) {
                 $GetParam{$Key} = $FieldConfig->{$Key};
             }
 

diff --git a/Kernel/Modules/AdminDynamicFieldScript.pm b/Kernel/Modules/AdminDynamicFieldScript.pm
@@ -70,7 +70,7 @@ sub Run {
         if ( IsHashRefWithData($FieldConfig) ) {
 
             # copy standard stuff
-            for my $Key (qw(ObjectType FieldType FieldOrder Label Name ValidID)) {
+            for my $Key (qw(ObjectType FieldType Label Name ValidID)) {
                 $Param{$Key} = $FieldConfig->{$Key};
             }
 

diff --git a/Kernel/Modules/AdminDynamicFieldSet.pm b/Kernel/Modules/AdminDynamicFieldSet.pm
@@ -97,7 +97,7 @@ sub _Add {
         if ( IsHashRefWithData($FieldConfig) ) {
 
             # copy standard stuff
-            for my $Key (qw(ObjectType FieldType FieldOrder Label Name ValidID)) {
+            for my $Key (qw(ObjectType FieldType Label Name ValidID)) {
                 $GetParam{$Key} = $FieldConfig->{$Key};
             }
 

diff --git a/Kernel/Modules/AdminDynamicFieldText.pm b/Kernel/Modules/AdminDynamicFieldText.pm
@@ -140,7 +140,7 @@ sub _Add {
         if ( IsHashRefWithData($FieldConfig) ) {
 
             # copy standard stuff
-            for my $Key (qw(ObjectType FieldType FieldOrder Label Name ValidID)) {
+            for my $Key (qw(ObjectType FieldType Label Name ValidID)) {
                 $GetParam{$Key} = $FieldConfig->{$Key};
             }
 

diff --git a/Kernel/Modules/AdminDynamicFieldTitle.pm b/Kernel/Modules/AdminDynamicFieldTitle.pm
@@ -95,7 +95,7 @@ sub _Add {
         if ( IsHashRefWithData($FieldConfig) ) {
 
             # copy standard stuff
-            for my $Key (qw(ObjectType FieldType FieldOrder Label Name ValidID)) {
+            for my $Key (qw(ObjectType FieldType Label Name ValidID)) {
                 $GetParam{$Key} = $FieldConfig->{$Key};
             }
 

diff --git a/Kernel/Modules/AdminDynamicFieldWebService.pm b/Kernel/Modules/AdminDynamicFieldWebService.pm
@@ -156,7 +156,7 @@ sub _Add {
         if ( IsHashRefWithData($FieldConfig) ) {
 
             # copy standard stuff
-            for my $Key (qw(ObjectType FieldType FieldOrder Label Name ValidID)) {
+            for my $Key (qw(ObjectType FieldType Label Name ValidID)) {
                 $GetParam{$Key} = $FieldConfig->{$Key};
             }
 

diff --git a/var/httpd/htdocs/js/Core.Agent.Admin.DynamicField.js b/var/httpd/htdocs/js/Core.Agent.Admin.DynamicField.js
@@ -230,11 +230,14 @@ Core.Agent.Admin.DynamicField = (function (TargetNS) {
     TargetNS.DynamicFieldClone = function() {
         $('.DynamicFieldClone').on('click', function (Event) {
 
+            // get field order
+            var FieldOrder = parseInt($('#MaxFieldOrder').val(), 10) + 1;
+
             // don't interfere with MasterAction
             Event.stopPropagation();
             Event.preventDefault();
 
-            window.location = $(this).attr('href');
+            window.location = $(this).attr('href') + ';FieldOrder=' + FieldOrder;
 
             return false;
         });