diff options
Diffstat (limited to 'rt/lib/RT/Config.pm')
| -rw-r--r-- | rt/lib/RT/Config.pm | 87 |
1 files changed, 38 insertions, 49 deletions
diff --git a/rt/lib/RT/Config.pm b/rt/lib/RT/Config.pm index 7b57beaba..7aa25b380 100644 --- a/rt/lib/RT/Config.pm +++ b/rt/lib/RT/Config.pm @@ -1,40 +1,40 @@ # BEGIN BPS TAGGED BLOCK {{{ -# +# # COPYRIGHT: -# -# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC -# <sales@bestpractical.com> -# +# +# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC +# <jesse@bestpractical.com> +# # (Except where explicitly superseded by other copyright notices) -# -# +# +# # LICENSE: -# +# # This work is made available to you under the terms of Version 2 of # the GNU General Public License. A copy of that license should have # been provided with this software, but in any event can be snarfed # from www.gnu.org. -# +# # This work is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301 or visit their web page on the internet at # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. -# -# +# +# # CONTRIBUTION SUBMISSION POLICY: -# +# # (The following paragraph is not intended to limit the rights granted # to you to modify and distribute this software under the terms of # the GNU General Public License and is only of importance to you if # you choose to contribute your changes and enhancements to the # community by submitting them to Best Practical Solutions, LLC.) -# +# # By intentionally submitting any modifications, corrections or # derivatives to this work, or any other work intended for use with # Request Tracker, to Best Practical Solutions, LLC, you confirm that @@ -43,7 +43,7 @@ # royalty-free, perpetual, license to use, copy, create derivative # works based on those contributions, and sublicense and distribute # those contributions and any derivatives thereof. -# +# # END BPS TAGGED BLOCK }}} package RT::Config; @@ -173,7 +173,7 @@ our %META = ( WidgetArguments => { Description => 'Theme', #loc # XXX: we need support for 'get values callback' - Values => [qw(3.5-default 3.4-compat web2)], + Values => [qw(3.5-default 3.4-compat web2 freeside2.1)], }, }, MessageBoxRichText => { @@ -231,29 +231,6 @@ our %META = ( }, }, }, - ResolveDefaultUpdateType => { - Section => 'General', #loc - Overridable => 1, - SortOrder => 9, - Widget => '/Widgets/Form/Select', - WidgetArguments => { - Description => 'Default Update Type when Resolving', #loc - Values => [qw(Comment Respond)], - ValuesLabel => { - Comment => "Comments (Not sent to requestors)", #loc - Respond => "Reply to requestors", #loc - }, - }, - }, - SuppressAutoOpenOnUpdate => { - Section => 'General', - Overridable => 1, - SortOrder => 10, - Widget => '/Widgets/Form/Boolean', - WidgetArguments => { - Description => 'Suppress automatic new to open status change on ticket update' # loc - } - }, # User overridable options for RT at a glance DefaultSummaryRows => { @@ -336,6 +313,16 @@ our %META = ( Hints => 'Use css rules to display text monospaced and with formatting preserved, but wrap as needed. This does not work well with IE6 and you should use the previous option', #loc }, }, + DisplayAfterQuickCreate => { + Section => 'Ticket display', + Overridable => 1, + SortOrder => 6, + Widget => '/Widgets/Form/Boolean', + WidgetArguments => { + Description => 'On Quick Create, redirect to ticket display', #loc + #Hints => '', #loc + }, + }, # User overridable locale options DateTimeFormat => { @@ -363,13 +350,15 @@ our %META = ( my $value = $self->Get('RTAddressRegexp'); return if $value; - $RT::Logger->debug( - 'The RTAddressRegexp option is not set in the config.' - .' Not setting this option results in additional SQL queries to' - .' check whether each address belongs to RT or not.' - .' It is especially important to set this option if RT recieves' - .' emails on addresses that are not in the database or config.' - ); + #XXX freeside - should fix this at some point, but it is being WAY + #too noisy in the logs + #$RT::Logger->error( + # 'The RTAddressRegexp option is not set in the config.' + # .' Not setting this option results in additional SQL queries to' + # .' check whether each address belongs to RT or not.' + # .' It is especially important to set this option if RT recieves' + # .' emails on addresses that are not in the database or config.' + #); }, }, # User overridable mail options @@ -806,8 +795,8 @@ sub SetFromConfig { # RTIR's options is set in main site config or RTFM's warn "Change of config option '$name' at $args{'File'} line $args{'Line'} has been ignored." - ." It may be ok, but we want you to be aware." - ." This option has been set earlier in $source{'File'} line $source{'Line'}." + ." It's may be ok, but we want you to be aware." + ." This option earlier has been set in $source{'File'} line $source{'Line'}." ; } @@ -868,7 +857,7 @@ sub SetFromConfig { # get entry for type we are looking for # XXX skip references to scalars or other references. - # Otherwie 5.10 goes boom. maybe we should skip any + # Otherwie 5.10 goes boom. may be we should skip any # reference next if ref($entry) eq 'SCALAR' || ref($entry) eq 'REF'; my $entry_ref = *{$entry}{ ref($ref) }; |