projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT 4.0.19
[freeside.git]
/
rt
/
lib
/
RT
/
Config.pm
diff --git
a/rt/lib/RT/Config.pm
b/rt/lib/RT/Config.pm
index
c56d4c6
..
18f2b7a
100644
(file)
--- a/
rt/lib/RT/Config.pm
+++ b/
rt/lib/RT/Config.pm
@@
-2,7
+2,7
@@
#
# COPYRIGHT:
#
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-201
2
Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-201
4
Best Practical Solutions, LLC
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@
-209,10
+209,11
@@
our %META = (
$RT::Logger->warning(
"The default stylesheet ($value) does not exist in this instance of RT. "
$RT::Logger->warning(
"The default stylesheet ($value) does not exist in this instance of RT. "
- . "Defaulting to
aileron
."
+ . "Defaulting to
freeside3
."
);
);
- $self->Set('WebDefaultStylesheet', 'aileron');
+ #$self->Set('WebDefaultStylesheet', 'aileron');
+ $self->Set('WebDefaultStylesheet', 'freeside3');
},
},
UseSideBySideLayout => {
},
},
UseSideBySideLayout => {
@@
-302,15
+303,6
@@
our %META = (
},
# User overridable options for RT at a glance
},
# User overridable options for RT at a glance
- DefaultSummaryRows => {
- Section => 'RT at a glance', #loc
- Overridable => 1,
- SortOrder => 1,
- Widget => '/Widgets/Form/Integer',
- WidgetArguments => {
- Description => 'Number of search results', #loc
- },
- },
HomePageRefreshInterval => {
Section => 'RT at a glance', #loc
Overridable => 1,
HomePageRefreshInterval => {
Section => 'RT at a glance', #loc
Overridable => 1,
@@
-410,8
+402,8
@@
our %META = (
Description => q|What tickets to display in the 'More about requestor' box|, #loc
Values => [qw(Active Inactive All None)],
ValuesLabel => {
Description => q|What tickets to display in the 'More about requestor' box|, #loc
Values => [qw(Active Inactive All None)],
ValuesLabel => {
- Active => "Show the Requestor's 10 highest priority
open
tickets", #loc
- Inactive => "Show the Requestor's 10 highest priority
closed
tickets", #loc
+ Active => "Show the Requestor's 10 highest priority
active
tickets", #loc
+ Inactive => "Show the Requestor's 10 highest priority
inactive
tickets", #loc
All => "Show the Requestor's 10 highest priority tickets", #loc
None => "Show no tickets for the Requestor", #loc
},
All => "Show the Requestor's 10 highest priority tickets", #loc
None => "Show no tickets for the Requestor", #loc
},
@@
-445,10
+437,13
@@
our %META = (
Description => 'Date format', #loc
Callback => sub { my $ret = { Values => [], ValuesLabel => {}};
my $date = RT::Date->new($HTML::Mason::Commands::session{'CurrentUser'});
Description => 'Date format', #loc
Callback => sub { my $ret = { Values => [], ValuesLabel => {}};
my $date = RT::Date->new($HTML::Mason::Commands::session{'CurrentUser'});
- $date->Set;
+ $date->Set
ToNow
;
foreach my $value ($date->Formatters) {
push @{$ret->{Values}}, $value;
foreach my $value ($date->Formatters) {
push @{$ret->{Values}}, $value;
- $ret->{ValuesLabel}{$value} = $date->$value();
+ $ret->{ValuesLabel}{$value} = $date->Get(
+ Format => $value,
+ Timezone => 'user',
+ );
}
return $ret;
},
}
return $ret;
},
@@
-748,7
+743,7
@@
our %META = (
my %seen;
foreach my $encoding ( grep defined && length, splice @$value ) {
my %seen;
foreach my $encoding ( grep defined && length, splice @$value ) {
- next if $seen{ $encoding }
++
;
+ next if $seen{ $encoding };
if ( $encoding eq '*' ) {
unshift @$value, '*';
next;
if ( $encoding eq '*' ) {
unshift @$value, '*';
next;
@@
-1214,7
+1209,7
@@
sub SetFromConfig {
# if the entry has a trailing '::' then
# it is a link to another name space
if ( substr( $k, -2 ) eq '::') {
# if the entry has a trailing '::' then
# it is a link to another name space
if ( substr( $k, -2 ) eq '::') {
- $name = $self->__GetNameByRef( $ref, $k );
+ $name = $self->__GetNameByRef( $ref, $
pack eq 'main::'? $k : $pack.$
k );
return $name if $name;
}
return $name if $name;
}
@@
-1229,13
+1224,19
@@
sub SetFromConfig {
# Otherwie 5.10 goes boom. maybe we should skip any
# reference
next if ref($entry) eq 'SCALAR' || ref($entry) eq 'REF';
# Otherwie 5.10 goes boom. maybe we should skip any
# reference
next if ref($entry) eq 'SCALAR' || ref($entry) eq 'REF';
- my $entry_ref = *{$entry}{ ref($ref) };
+
+ my $ref_type = ref($ref);
+
+ # regex/arrayref/hashref/coderef are stored in SCALAR glob
+ $ref_type = 'SCALAR' if $ref_type eq 'REF';
+
+ my $entry_ref = *{$entry}{ $ref_type };
next unless $entry_ref;
# if references are equal then we've found
if ( $entry_ref == $ref ) {
$last_pack = $pack;
next unless $entry_ref;
# if references are equal then we've found
if ( $entry_ref == $ref ) {
$last_pack = $pack;
- return ( $REF_SYMBOLS{
ref($ref)
} || '*' ) . $pack . $k;
+ return ( $REF_SYMBOLS{
$ref_type
} || '*' ) . $pack . $k;
}
}
return '';
}
}
return '';