[Rt-commit] rt branch, master, updated. rt-4.1.5-185-g6cb4a70
Alex Vandiver
alexmv at bestpractical.com
Fri Dec 28 19:52:49 EST 2012
The branch, master has been updated
via 6cb4a7037aec01ba2cf6ccf3debccb380e525c67 (commit)
via ceeea1d5ee4b3d165702ed0cfaa06f8b283b079c (commit)
via 52da89c42fac9904931c57f0efe94789175a7e42 (commit)
via 64ad1fc815caa2b5c109091dbd90b0b527ffb639 (commit)
from e56fd5813c33e855d2ed02f72a1a14023f1950c5 (commit)
Summary of changes:
docs/UPGRADING-4.2 | 5 +++++
etc/RT_Config.pm.in | 31 +++++--------------------------
lib/RT/Interface/Web.pm | 26 ++++++++++++++++++++++++++
lib/RT/Squish/JS.pm | 2 +-
share/html/Elements/HeaderJavascript | 2 +-
share/html/m/_elements/header | 2 +-
6 files changed, 39 insertions(+), 29 deletions(-)
- Log -----------------------------------------------------------------
commit 6cb4a7037aec01ba2cf6ccf3debccb380e525c67
Merge: e56fd58 ceeea1d
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Fri Dec 28 19:48:12 2012 -0500
Merge branch '4.2/move-default-js-out-of-config'
Conflicts:
docs/UPGRADING-4.2
etc/RT_Config.pm.in
lib/RT/Squish/JS.pm
share/html/m/_elements/header
The conflict in RT_Config.pm.in was due to JS files which were added
since the branch branched; these new files have been added into
RT::Interface::Web->JSFiles accordingly.
One additional call site of ->Get('JSFiles') in m/_elements/header was
also added since the branch branched; adjust it to call
RT::Interface::Web->JSFiles.
diff --cc docs/UPGRADING-4.2
index b1071e2,a6c88b7..4b165ff
--- a/docs/UPGRADING-4.2
+++ b/docs/UPGRADING-4.2
@@@ -11,48 -5,7 +11,53 @@@ UPGRADING FROM RT 4.0.0 and greate
but an informational notice will be issued on server start telling you about
the rename. To avoid this you should set $LogToSTDERR instead.
+* The link direction and type maps are consolidated into RT::Link. If you
+ wrote local customizations or extensions utilizing %RT::Ticket::LINKDIRMAP,
+ %RT::Ticket::LINKTYPEMAP, RT::Ticket->LINKDIRMAP, RT::Ticket->LINKTYPEMAP, or
+ %RT::Record::LINKDIRMAP, you will need to switch to %RT::Link::DIRMAP and
+ %RT::Link::TYPEMAP.
+
+* $LinkTransactionsRun1Scrip is removed. If you were relying on this behaviour
+ (by setting it to 1), you should adjust your scrips to ignore one of the link
+ transactions.
+
+* The $AttachmentUnits option was removed in preference of always displaying in
+ megabytes, kilobytes, or bytes as appropriate. The option was incompletely
+ implemented and controlled display in the attachments list but not history.
+
+* MakeClicky handlers added via a callback are now passed an "object" key in
+ the parameter hash instead of "ticket". The object may be any RT::Record
+ subclass.
+
+* $MessageBoxWrap was removed. Wrapping is now always SOFT. If you want hard
+ line breaks, enter them manually.
+
+* ShowUser handlers (/Elements/ShowUser*) have moved out of Mason components
+ and into RT::User methods. Any custom username formats will need to be
+ reimplemented as RT::User methods. Renaming should follow that of the core
+ components:
+
+ /Elements/ShowUserConcise => RT::User->_FormatUserConcise
+ /Elements/ShowUserVerbose => RT::User->_FormatUserVerbose
+
+ The _FormatUser* methods are passed a hash containing the keys User and
+ Address, which have the same properties as before.
+
+* Rich text (HTML) messages are now preferred for display. If you prefer plain
+ text messages, set $PreferRichText to 0.
+
+* User email addresses are now validated by default and multiple,
+ comma-separated addresses for a single user are no longer allowed. Existing
+ users with invalid addresses will continue to work until the next time they
+ are updated by an administrator on the modify user page. If you prefer no
+ address validation, set $ValidateUserEmailAddresses to 0.
+
+* The 'smtp' value for $MailCommand, along with the associated
+ $SMTPServer, $SMTPFrom, and $SMTPDebug options, has been removed
+ because it did not guarantee delivery. Instead, use a local MTA for
+ outgoing mail, via the 'sendmailpipe' setting to $MailCommand.
++
+ * The @JSFiles config now only keeps additional JavaScript filenames; if
+ you had copied @JSFiles to add extra entries in your RT_SiteConfig,
+ remove the core JS from the list, or RT will serve those files
+ multiple times.
diff --cc lib/RT/Interface/Web.pm
index 5cdd98e,9ebabfd..8f2f46b
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@@ -100,6 -99,29 +100,32 @@@ sub SquishedJS
return $js;
}
+ =head2 JSFiles
+
+ =cut
+
+ sub JSFiles {
+ return qw/
+ jquery-1.4.2.min.js
+ jquery_noconflict.js
+ jquery-ui-1.8.4.custom.min.js
++ jquery-ui-timepicker-addon.js
+ jquery-ui-patch-datepicker.js
- ui.timepickr.js
++ jquery.modal.min.js
++ jquery.modal-defaults.js
+ titlebox-state.js
+ util.js
+ userautocomplete.js
+ jquery.event.hover-1.0.js
+ superfish.js
+ supersubs.js
+ jquery.supposition.js
+ history-folding.js
++ event-registration.js
+ late.js
+ /, RT->Config->Get('JSFiles');
+ }
+
=head2 ClearSquished
Removes the cached CSS and JS entries, forcing them to be regenerated
diff --cc lib/RT/Squish/JS.pm
index 6309d01,4400ef7..e968e0f
--- a/lib/RT/Squish/JS.pm
+++ b/lib/RT/Squish/JS.pm
@@@ -75,14 -75,8 +75,14 @@@ sub Squish
my $self = shift;
my $content;
- for my $file ( RT->Config->Get('JSFiles') ) {
+ for my $file ( RT::Interface::Web->JSFiles ) {
- $content .= $HTML::Mason::Commands::m->scomp("/NoAuth/js/$file");
+ my $path = "/NoAuth/js/$file";
+ if ( $HTML::Mason::Commands::m->comp_exists($path) ) {
+ $content .= $HTML::Mason::Commands::m->scomp($path);
+ } else {
+ RT->Logger->error("Unable to open $path for JS Squishing");
+ next;
+ }
}
return $self->Filter($content);
diff --cc share/html/m/_elements/header
index 42b3776,f8fb728..c8800d8
--- a/share/html/m/_elements/header
+++ b/share/html/m/_elements/header
@@@ -58,8 -58,6 +58,8 @@@ $r->headers_out->{'Cache-control'} = 'n
<& /Elements/Framekiller &>
<link rel="stylesheet" type="text/css" href="<%RT->Config->Get('WebPath')|n%>/m/style.css"/>
<title><%$title%></title>
- % my ($jquery) = grep { /^jquery-\d+\./ } RT->Config->Get('JSFiles');
++% my ($jquery) = grep { /^jquery-\d+\./ } RT::Interface::Web->JSFiles;
+<script src="<% RT->Config->Get('WebPath') %>/NoAuth/js/<% $jquery %>"></script>
<meta name="viewport" content="width=device-width height=device-height user-scalable=yes"/>
</head>
<body>
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list