Skip to content

Commit

Permalink
Issue #2251: Changing NameSpace to Namespace.
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanhaerter committed Apr 6, 2023
1 parent e150d31 commit 23ed684
Show file tree
Hide file tree
Showing 14 changed files with 93 additions and 93 deletions.
2 changes: 1 addition & 1 deletion Kernel/Config/Files/XML/MultiValueDynamicFields.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
</Hash>
</Value>
</Setting>
<Setting Name="DynamicField::NameSpaces" Required="0" Valid="0">
<Setting Name="DynamicField::Namespaces" Required="0" Valid="0">
<Description Translatable="1">Define possible namespaces for dynamic fields.</Description>
<Navigation>Core::DynamicFields</Navigation>
<Value>
Expand Down
28 changes: 14 additions & 14 deletions Kernel/Modules/AdminDynamicFieldDB.pm
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ sub _AddAction {
qw(
ObjectType ObjectTypeName FieldType FieldTypeName ValidID Link LinkPreview DBType Server Port
DBName DBTable User Password Identifier Multiselect CacheTTL Searchprefix Searchsuffix
SID Driver ResultLimit CaseSensitive Tooltip MultiValue NameSpace
SID Driver ResultLimit CaseSensitive Tooltip MultiValue Namespace
)
)
{
Expand All @@ -160,7 +160,7 @@ sub _AddAction {
Translatable('The field does not contain only ASCII letters and numbers.');
}

$GetParam{Name} = $GetParam{NameSpace} ? $GetParam{NameSpace} . '-' . $GetParam{Name} : $GetParam{Name};
$GetParam{Name} = $GetParam{Namespace} ? $GetParam{Namespace} . '-' . $GetParam{Name} : $GetParam{Name};

# Check if name is duplicated.
my %DynamicFieldsList = %{
Expand Down Expand Up @@ -373,7 +373,7 @@ sub _ChangeAction {
qw(
ObjectType ObjectTypeName FieldType FieldTypeName ValidID Link LinkPreview DBType Server Port
DBName DBTable User Password Identifier Multiselect CacheTTL Searchprefix Searchsuffix
SID Driver ResultLimit CaseSensitive Tooltip MultiValue NameSpace
SID Driver ResultLimit CaseSensitive Tooltip MultiValue Namespace
)
)
{
Expand All @@ -391,7 +391,7 @@ sub _ChangeAction {
Translatable('The field does not contain only ASCII letters and numbers.');
}

$GetParam{Name} = $GetParam{NameSpace} ? $GetParam{NameSpace} . '-' . $GetParam{Name} : $GetParam{Name};
$GetParam{Name} = $GetParam{Namespace} ? $GetParam{Namespace} . '-' . $GetParam{Name} : $GetParam{Name};

# Check if name is duplicated.
my %DynamicFieldsList = %{
Expand Down Expand Up @@ -562,14 +562,14 @@ sub _ShowScreen {

$Param{Name} //= '';

my $NameSpace;
my $Namespace;
if ( $Param{Mode} eq 'Change' ) {
$Param{ShowWarning} = 'ShowWarning';
$Param{DisplayFieldName} = $Param{Name};

# check for namespace identifier in dynamic field name
if ( $Param{Name} =~ /(.*)-(.*)/ ) {
$NameSpace = $1;
$Namespace = $1;
$Param{PlainFieldName} = $2;
}
else {
Expand Down Expand Up @@ -642,21 +642,21 @@ sub _ShowScreen {
);

# Build namespace selection
my $NameSpaceList = $Kernel::OM->Get('Kernel::Config')->Get('DynamicField::NameSpaces');
if ( IsArrayRefWithData($NameSpaceList) ) {
my $NameSpaceStrg = $LayoutObject->BuildSelection(
Data => $NameSpaceList,
Name => 'NameSpace',
SelectedValue => $NameSpace || '',
my $NamespaceList = $Kernel::OM->Get('Kernel::Config')->Get('DynamicField::Namespaces');
if ( IsArrayRefWithData($NamespaceList) ) {
my $NamespaceStrg = $LayoutObject->BuildSelection(
Data => $NamespaceList,
Name => 'Namespace',
SelectedValue => $Namespace || '',
PossibleNone => 1,
Translation => 1,
Class => 'Modernize W75pc',
);

$LayoutObject->Block(
Name => 'DynamicFieldNameSpace',
Name => 'DynamicFieldNamespace',
Data => {
NameSpaceStrg => $NameSpaceStrg,
NamespaceStrg => $NamespaceStrg,
},
);
}
Expand Down
28 changes: 14 additions & 14 deletions Kernel/Modules/AdminDynamicFieldDropdown.pm
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ sub _AddAction {
for my $ConfigParam (
qw(
ObjectType ObjectTypeName FieldType FieldTypeName DefaultValue PossibleNone
TranslatableValues ValidID Link LinkPreview Tooltip MultiValue NameSpace
TranslatableValues ValidID Link LinkPreview Tooltip MultiValue Namespace
)
)
{
Expand All @@ -168,7 +168,7 @@ sub _AddAction {
Translatable('The field does not contain only ASCII letters and numbers.');
}

$GetParam{Name} = $GetParam{NameSpace} ? $GetParam{NameSpace} . '-' . $GetParam{Name} : $GetParam{Name};
$GetParam{Name} = $GetParam{Namespace} ? $GetParam{Namespace} . '-' . $GetParam{Name} : $GetParam{Name};

# check if name is duplicated
my %DynamicFieldsList = %{
Expand Down Expand Up @@ -404,7 +404,7 @@ sub _ChangeAction {
for my $ConfigParam (
qw(
ObjectType ObjectTypeName FieldType FieldTypeName DefaultValue PossibleNone
TranslatableValues ValidID Link LinkPreview Tooltip MultiValue NameSpace
TranslatableValues ValidID Link LinkPreview Tooltip MultiValue Namespace
)
)
{
Expand All @@ -422,7 +422,7 @@ sub _ChangeAction {
Translatable('The field does not contain only ASCII letters and numbers.');
}

$GetParam{Name} = $GetParam{NameSpace} ? $GetParam{NameSpace} . '-' . $GetParam{Name} : $GetParam{Name};
$GetParam{Name} = $GetParam{Namespace} ? $GetParam{Namespace} . '-' . $GetParam{Name} : $GetParam{Name};

# check if name is duplicated
my %DynamicFieldsList = %{
Expand Down Expand Up @@ -625,7 +625,7 @@ sub _ChangeAction {
sub _ShowScreen {
my ( $Self, %Param ) = @_;

my $NameSpace;
my $Namespace;
$Param{DisplayFieldName} = 'New';

if ( $Param{Mode} eq 'Change' ) {
Expand All @@ -634,7 +634,7 @@ sub _ShowScreen {

# check for namespace
if ( $Param{Name} =~ /(.*)-(.*)/ ) {
$NameSpace = $1;
$Namespace = $1;
$GetParam{PlainFieldName} = $2;
}
else {
Expand Down Expand Up @@ -707,21 +707,21 @@ sub _ShowScreen {
Class => 'Modernize W50pc',
);

my $NameSpaceList = $Kernel::OM->Get('Kernel::Config')->Get('DynamicField::NameSpaces');
if ( IsArrayRefWithData($NameSpaceList) ) {
my $NameSpaceStrg = $LayoutObject->BuildSelection(
Data => $NameSpaceList,
Name => 'NameSpace',
SelectedValue => $NameSpace || '',
my $NamespaceList = $Kernel::OM->Get('Kernel::Config')->Get('DynamicField::Namespaces');
if ( IsArrayRefWithData($NamespaceList) ) {
my $NamespaceStrg = $LayoutObject->BuildSelection(
Data => $NamespaceList,
Name => 'Namespace',
SelectedValue => $Namespace || '',
PossibleNone => 1,
Translation => 1,
Class => 'Modernize W75pc',
);

$LayoutObject->Block(
Name => 'DynamicFieldNameSpace',
Name => 'DynamicFieldNamespace',
Data => {
NameSpaceStrg => $NameSpaceStrg,
NamespaceStrg => $NamespaceStrg,
},
);
}
Expand Down
28 changes: 14 additions & 14 deletions Kernel/Modules/AdminDynamicFieldMultiselect.pm
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ sub _AddAction {
for my $ConfigParam (
qw(
ObjectType ObjectTypeName FieldType FieldTypeName PossibleNone
TranslatableValues ValidID Tooltip NameSpace
TranslatableValues ValidID Tooltip Namespace
)
)
{
Expand All @@ -167,7 +167,7 @@ sub _AddAction {
Translatable('The field does not contain only ASCII letters and numbers.');
}

$GetParam{Name} = $GetParam{NameSpace} ? $GetParam{NameSpace} . '-' . $GetParam{Name} : $GetParam{Name};
$GetParam{Name} = $GetParam{Namespace} ? $GetParam{Namespace} . '-' . $GetParam{Name} : $GetParam{Name};

# get dynamic field list
my $DynamicFieldsList = $DynamicFieldObject->DynamicFieldList(
Expand Down Expand Up @@ -408,7 +408,7 @@ sub _ChangeAction {
for my $ConfigParam (
qw(
ObjectType ObjectTypeName FieldType FieldTypeName PossibleNone
TranslatableValues ValidID Tooltip NameSpace
TranslatableValues ValidID Tooltip Namespace
)
)
{
Expand All @@ -426,7 +426,7 @@ sub _ChangeAction {
Translatable('The field does not contain only ASCII letters and numbers.');
}

$GetParam{Name} = $GetParam{NameSpace} ? $GetParam{NameSpace} . '-' . $GetParam{Name} : $GetParam{Name};
$GetParam{Name} = $GetParam{Namespace} ? $GetParam{Namespace} . '-' . $GetParam{Name} : $GetParam{Name};

# get dynamic field list
my $DynamicFieldsList = $DynamicFieldObject->DynamicFieldList(
Expand Down Expand Up @@ -632,14 +632,14 @@ sub _ShowScreen {

$Param{DisplayFieldName} = 'New';

my $NameSpace;
my $Namespace;
if ( $Param{Mode} eq 'Change' ) {
$Param{ShowWarning} = 'ShowWarning';
$Param{DisplayFieldName} = $Param{Name};

# check for namespace
if ( $Param{Name} =~ /(.*)-(.*)/ ) {
$NameSpace = $1;
$Namespace = $1;
$GetParam{PlainFieldName} = $2;
}
else {
Expand Down Expand Up @@ -701,21 +701,21 @@ sub _ShowScreen {
Class => 'Modernize W75pc Validate_Number',
);

my $NameSpaceList = $Kernel::OM->Get('Kernel::Config')->Get('DynamicField::NameSpaces');
if ( IsArrayRefWithData($NameSpaceList) ) {
my $NameSpaceStrg = $LayoutObject->BuildSelection(
Data => $NameSpaceList,
Name => 'NameSpace',
SelectedID => $NameSpace || '',
my $NamespaceList = $Kernel::OM->Get('Kernel::Config')->Get('DynamicField::Namespaces');
if ( IsArrayRefWithData($NamespaceList) ) {
my $NamespaceStrg = $LayoutObject->BuildSelection(
Data => $NamespaceList,
Name => 'Namespace',
SelectedID => $Namespace || '',
PossibleNone => 1,
Translation => 1,
Class => 'Modernize W75pc',
);

$LayoutObject->Block(
Name => 'DynamicFieldNameSpace',
Name => 'DynamicFieldNamespace',
Data => {
NameSpaceStrg => $NameSpaceStrg,
NamespaceStrg => $NamespaceStrg,
},
);
}
Expand Down
28 changes: 14 additions & 14 deletions Kernel/Modules/AdminDynamicFieldText.pm
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ sub _AddAction {
}

for my $ConfigParam (
qw(ObjectType ObjectTypeName FieldType FieldTypeName DefaultValue ValidID Rows Cols Link LinkPreview Tooltip MultiValue NameSpace)
qw(ObjectType ObjectTypeName FieldType FieldTypeName DefaultValue ValidID Rows Cols Link LinkPreview Tooltip MultiValue Namespace)
)
{
$GetParam{$ConfigParam} = $ParamObject->GetParam( Param => $ConfigParam );
Expand All @@ -155,7 +155,7 @@ sub _AddAction {
Translatable('The field does not contain only ASCII letters and numbers.');
}

$GetParam{Name} = $GetParam{NameSpace} ? $GetParam{NameSpace} . '-' . $GetParam{Name} : $GetParam{Name};
$GetParam{Name} = $GetParam{Namespace} ? $GetParam{Namespace} . '-' . $GetParam{Name} : $GetParam{Name};

# check if name is duplicated
my %DynamicFieldsList = %{
Expand Down Expand Up @@ -355,7 +355,7 @@ sub _ChangeAction {
}

for my $ConfigParam (
qw(ObjectType ObjectTypeName FieldType FieldTypeName DefaultValue ValidID Rows Cols Link LinkPreview Tooltip MultiValue NameSpace)
qw(ObjectType ObjectTypeName FieldType FieldTypeName DefaultValue ValidID Rows Cols Link LinkPreview Tooltip MultiValue Namespace)
)
{
$GetParam{$ConfigParam} = $ParamObject->GetParam( Param => $ConfigParam );
Expand All @@ -372,7 +372,7 @@ sub _ChangeAction {
Translatable('The field does not contain only ASCII letters and numbers.');
}

$GetParam{Name} = $GetParam{NameSpace} ? $GetParam{NameSpace} . '-' . $GetParam{Name} : $GetParam{Name};
$GetParam{Name} = $GetParam{Namespace} ? $GetParam{Namespace} . '-' . $GetParam{Name} : $GetParam{Name};

# check if name is duplicated
my %DynamicFieldsList = %{
Expand Down Expand Up @@ -584,14 +584,14 @@ sub _ShowScreen {

$Param{DisplayFieldName} = 'New';

my $NameSpace;
my $Namespace;
if ( $Param{Mode} eq 'Change' ) {
$Param{ShowWarning} = 'ShowWarning';
$Param{DisplayFieldName} = $Param{Name};

# check for namespace
if ( $Param{Name} =~ /(.*)-(.*)/ ) {
$NameSpace = $1;
$Namespace = $1;
$Param{PlainFieldName} = $2;
}
else {
Expand Down Expand Up @@ -663,21 +663,21 @@ sub _ShowScreen {
Class => 'Modernize W50pc',
);

my $NameSpaceList = $Kernel::OM->Get('Kernel::Config')->Get('DynamicField::NameSpaces');
if ( IsArrayRefWithData($NameSpaceList) ) {
my $NameSpaceStrg = $LayoutObject->BuildSelection(
Data => $NameSpaceList,
Name => 'NameSpace',
SelectedValue => $NameSpace || '',
my $NamespaceList = $Kernel::OM->Get('Kernel::Config')->Get('DynamicField::Namespaces');
if ( IsArrayRefWithData($NamespaceList) ) {
my $NamespaceStrg = $LayoutObject->BuildSelection(
Data => $NamespaceList,
Name => 'Namespace',
SelectedValue => $Namespace || '',
PossibleNone => 1,
Translation => 1,
Class => 'Modernize W50pc',
);

$LayoutObject->Block(
Name => 'DynamicFieldNameSpace',
Name => 'DynamicFieldNamespace',
Data => {
NameSpaceStrg => $NameSpaceStrg,
NamespaceStrg => $NamespaceStrg,
},
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,14 @@
</div>
<div class="Clear"></div>

[% RenderBlockStart("DynamicFieldNameSpace") %]
<label for="NameSpace">[% Translate("Namespace") | html %]:</label>
[% RenderBlockStart("DynamicFieldNamespace") %]
<label for="Namespace">[% Translate("Namespace") | html %]:</label>
<div class="Field">
[% Data.NameSpaceStrg %]
[% Data.NamespaceStrg %]
<p class="FieldExplanation">[% Translate("This is the namespace in which this field will be used as prefix with the name.") | html %]</p>
</div>
<div class="Clear"></div>
[% RenderBlockEnd("DynamicFieldNameSpace") %]
[% RenderBlockEnd("DynamicFieldNamespace") %]

<label for="TooltipValue">[% Translate("Tooltip message:") | html %]</label>
<div class="Field">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,14 @@
</div>
<div class="Clear"></div>

[% RenderBlockStart("DynamicFieldNameSpace") %]
<label for="NameSpace">[% Translate("Namespace") | html %]:</label>
[% RenderBlockStart("DynamicFieldNamespace") %]
<label for="Namespace">[% Translate("Namespace") | html %]:</label>
<div class="Field">
[% Data.NameSpaceStrg %]
[% Data.NamespaceStrg %]
<p class="FieldExplanation">[% Translate("This is the namespace in which this field will be used as prefix with the name.") | html %]</p>
</div>
<div class="Clear"></div>
[% RenderBlockEnd("DynamicFieldNameSpace") %]
[% RenderBlockEnd("DynamicFieldNamespace") %]

<label for="TooltipValue">[% Translate("Tooltip message:") | html %]</label>
<div class="Field">
Expand Down
8 changes: 4 additions & 4 deletions Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldDB.tt
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,14 @@
</div>
<div class="Clear"></div>

[% RenderBlockStart("DynamicFieldNameSpace") %]
<label for="NameSpace">[% Translate("Namespace") | html %]:</label>
[% RenderBlockStart("DynamicFieldNamespace") %]
<label for="Namespace">[% Translate("Namespace") | html %]:</label>
<div class="Field">
[% Data.NameSpaceStrg %]
[% Data.NamespaceStrg %]
<p class="FieldExplanation">[% Translate("This is the namespace in which this field will be used as prefix with the name.") | html %]</p>
</div>
<div class="Clear"></div>
[% RenderBlockEnd("DynamicFieldNameSpace") %]
[% RenderBlockEnd("DynamicFieldNamespace") %]

<label for="TooltipValue">[% Translate("Tooltip message:") | html %]</label>
<div class="Field">
Expand Down
Loading

0 comments on commit 23ed684

Please sign in to comment.