684421a2 by Paweł Bogusławski

Merge master into master-ib fixes (IB#1068070)

1 parent 09ae4e73
......@@ -195,7 +195,7 @@
<SubGroup>Core</SubGroup>
<ValidateModule>Kernel::System::SysConfig::QueueValidate</ValidateModule>
<Setting>
<String Regex="">Raw</String>
<String Regex="">Zgłoszenia</String>
</Setting>
</ConfigItem>
<ConfigItem Name="Process::DefaultState" Required="1" Valid="1">
......
......@@ -383,7 +383,7 @@
<Description Translatable="1">This option defines the process tickets default queue.</Description>
<Navigation>Core</Navigation>
<Value>
<Item ValueType="Entity" ValueEntityType="Queue" ValueRegex="">Raw</Item>
<Item ValueType="Entity" ValueEntityType="Queue" ValueRegex="">Zgłoszenia</Item>
</Value>
</Setting>
<Setting Name="Process::DefaultState" Required="1" Valid="1">
......
......@@ -6213,7 +6213,7 @@
<Navigation>Frontend::Agent::Dashboard::EventsTicketCalendar</Navigation>
<Value>
<Array>
<Item>Raw</Item>
<Item>Zgłoszenia</Item>
</Array>
</Value>
</Setting>
......@@ -10491,7 +10491,7 @@
<Description Translatable="1">Defines the postmaster default queue.</Description>
<Navigation>Core::PostMaster</Navigation>
<Value>
<Item ValueType="Entity" ValueEntityType="Queue" ValueRegex="">Raw</Item>
<Item ValueType="Entity" ValueEntityType="Queue" ValueRegex="">Zgłoszenia</Item>
</Value>
</Setting>
<Setting Name="PostmasterDefaultPriority" Required="1" Valid="1">
......
<?xml version="1.0" encoding="utf-8" ?>
<otrs_config version="2.0" init="Framework">
<Setting Name="Loader::Agent::Skin###100-hdesk_pl" Required="0" Valid="1">
<Description Translatable="1">hdesk.pl skin</Description>
<Navigation>Frontend::Agent</Navigation>
<Value>
<Hash>
<Item Key="InternalName">hdesk.pl</Item>
<Item Key="VisibleName" Translatable="1">hdesk.pl</Item>
<Item Key="Description" Translatable="1">hdesk.pl skin</Item>
<Item Key="HomePage">http://www.hdesk.pl/</Item>
</Hash>
</Value>
</Setting>
</otrs_config>
<?xml version="1.0" encoding="utf-8" ?>
<otrs_config version="2.0" init="Framework">
<Setting Name="Loader::Customer::Skin###100-hdesk.pl" Required="0" Valid="1">
<Description Translatable="1">hdesk.pl skin</Description>
<Navigation>Frontend::Customer</Navigation>
<Value>
<Hash>
<Item Key="InternalName">hdesk.pl</Item>
<Item Key="VisibleName" Translatable="1">hdesk.pl</Item>
<Item Key="Description" Translatable="1">hdesk.pl skin</Item>
<Item Key="HomePage">http://www.hdesk.pl/</Item>
</Hash>
</Value>
</Setting>
</otrs_config>
......@@ -1832,7 +1832,7 @@ sub _Mask {
# default selected article type for internal source articles
if ( !$Selected{SelectedValue} && $Config->{DefaultArticleTypeInternal} && $Param{SourceArticleTypeID} ) {
my $SourceArticleType = $TicketObject->ArticleTypeLookup( ArticleTypeID => $Param{SourceArticleTypeID} );
my $SourceArticleType = $ArticleObject->ArticleTypeLookup( ArticleTypeID => $Param{SourceArticleTypeID} );
if ( $SourceArticleType && $SourceArticleType =~ m{internal} ) {
$Selected{SelectedValue} = $Config->{DefaultArticleTypeInternal};
}
......
......@@ -15,8 +15,6 @@ use warnings;
use Kernel::System::Sphinx;
use vars qw(@ISA);
our @ObjectDependencies = (
'Kernel::System::Log',
'Kernel::System::Main',
......@@ -24,15 +22,12 @@ our @ObjectDependencies = (
);
sub new {
my ( $Type, %Param ) = @_;
my ( $Class, %Param ) = @_;
my $Self = {};
bless( $Self, $Type );
$Kernel::OM->Get('Kernel::System::Main')->RequireBaseClass('Kernel::System::Ticket::ArticleSearchIndex::StaticDB')
|| die 'Could not load Kernel::System::Ticket::ArticleSearchIndex::StaticDB';
if ( !$Kernel::OM->Get('Kernel::System::Main')->Require('Kernel::System::Ticket::ArticleSearchIndex::StaticDB') ) {
die "Can't load ticket search index backend module Kernel::System::Ticket::ArticleSearchIndex::StaticDB! $@";
}
push @ISA, 'Kernel::System::Ticket::ArticleSearchIndex::StaticDB';
my $Self = $Class->SUPER::new(%Param);
$Self->{SphinxObject} = Kernel::System::Sphinx->new(%Param);
......@@ -42,7 +37,7 @@ sub new {
$Self->{UpdateOnly} = $Self->{SphinxObject}->UpdateOnly();
}
return $Self->SUPER::new(%Param);
return $Self;
}
sub ArticleIndexBuild {
......@@ -64,7 +59,7 @@ sub ArticleIndexBuild {
if ($Self->{SphinxObject}) {
my %Article = $Self->ArticleGet(
my %Article = $Kernel::OM->Get('Kernel::System::Ticket::Article')->ArticleGet(
ArticleID => $Param{ArticleID},
UserID => $Param{UserID},
DynamicFields => 0,
......
......@@ -517,13 +517,13 @@ for my $TicketSubjectConfig ( 'Right', 'Left' ) {
if ( $File == 24 ) {
# check body
my %Article = $TicketObject->ArticleGet(
my %Article = $ArticleObject->ArticleGet(
ArticleID => $ArticleIDs[0],
DynamicFields => 1,
);
# check attachments
my %Index = $TicketObject->ArticleAttachmentIndex(
my %Index = $ArticleObject->ArticleAttachmentIndex(
ArticleID => $ArticleIDs[0],
Article => \%Article,
UserID => 1,
......@@ -536,7 +536,7 @@ for my $TicketSubjectConfig ( 'Right', 'Left' ) {
$NamePrefix . ' filename attachment check ArticleAttachmentIndex()',
);
my %Attachment = $TicketObject->ArticleAttachment(
my %Attachment = $ArticleObject->ArticleAttachment(
ArticleID => $ArticleIDs[0],
FileID => 2,
UserID => 1,
......