[Bps-public-commit] rt-extension-automaticassignment branch, master, updated. 0.04-4-g13707b1
? sunnavy
sunnavy at bestpractical.com
Tue Jul 28 17:19:42 EDT 2020
The branch, master has been updated
via 13707b1f79900a7abe0d2bc1274177ad330081c5 (commit)
via 15277965aabb45fc3f9d33e098714895136c391b (commit)
via d4d41b406e0595c61e8e98dfe4c786914cc2c4b4 (commit)
via db4802be9112c663bc0405da37c329da3c9d3f00 (commit)
from 87a2b8f487f806cce79dfb042dbd86ab9cc49062 (commit)
Summary of changes:
Changes | 3 +
MANIFEST | 2 -
META.yml | 8 +-
Makefile.PL | 4 +-
README | 7 +-
html/Admin/Queues/AutomaticAssignment.html | 26 +-
html/Admin/Queues/Elements/Chooser/ActiveTickets | 2 +-
html/Admin/Queues/Elements/Chooser/Random | 2 +-
html/Admin/Queues/Elements/Chooser/RoundRobin | 2 +-
html/Admin/Queues/Elements/Chooser/TimeLeft | 2 +-
html/Admin/Queues/Elements/Chooser/UserDefined | 4 +-
html/Admin/Queues/Elements/Filter/ExcludedDates | 55 +-
html/Admin/Queues/Elements/Filter/MemberOfGroup | 30 +-
html/Admin/Queues/Elements/Filter/MemberOfRole | 34 +-
html/Admin/Queues/Elements/Filter/UserDefined | 4 +-
html/Admin/Queues/Elements/Filter/WorkSchedule | 30 +-
html/Admin/Queues/Elements/SortableBox | 17 +-
lib/RT/Extension/AutomaticAssignment.pm | 11 +-
lib/RT/Extension/AutomaticAssignment/Test.pm.in | 2 +-
static/css/automatic-assignment.css | 21 -
static/images/remove.png | Bin 42548 -> 0 bytes
static/js/automatic-assignment.js | 1 +
static/js/jquery.ui.sortable.js | 1250 ----------------------
23 files changed, 130 insertions(+), 1387 deletions(-)
delete mode 100644 static/images/remove.png
delete mode 100644 static/js/jquery.ui.sortable.js
- Log -----------------------------------------------------------------
commit db4802be9112c663bc0405da37c329da3c9d3f00
Author: sunnavy <sunnavy at bestpractical.com>
Date: Wed Jul 29 03:37:11 2020 +0800
Migrate to elevator theme for RT 5
diff --git a/MANIFEST b/MANIFEST
index b213aaf..e4e4d81 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -53,9 +53,7 @@ MANIFEST This list of files
META.yml
README
static/css/automatic-assignment.css
-static/images/remove.png
static/js/automatic-assignment.js
-static/js/jquery.ui.sortable.js
t/basic.t
t/compile.t
t/excluded-dates.t
diff --git a/html/Admin/Queues/AutomaticAssignment.html b/html/Admin/Queues/AutomaticAssignment.html
index 27e49d7..d56064a 100644
--- a/html/Admin/Queues/AutomaticAssignment.html
+++ b/html/Admin/Queues/AutomaticAssignment.html
@@ -2,16 +2,16 @@
<& /Elements/Tabs &>
<& /Elements/ListActions, actions => \@results &>
-<form method="post" id="automatic-assignment" class="automatic-assignment" action="AutomaticAssignment.html">
+<form method="post" id="automatic-assignment" class="automatic-assignment mx-auto max-width-md" action="AutomaticAssignment.html">
<input type="hidden" class="hidden" name="id" value="<%$QueueObj->Id%>" />
<div class="filters">
-<h1>Filters</h1>
+<h3>Filters</h3>
<p><i>Filters reduce the pool of eligible owners. Each user must fulfill the requirements of all the filters below to be included in this queue's automatic assignment.</i></p>
-<select name="FilterType">
+<select name="FilterType" class="selectpicker">
<option value="">-</option>
% for my $filter (@filters) {
@@ -25,7 +25,7 @@
</select>
-<input type="submit" class="button" name="AddFilter" value="Add Filter">
+<input type="submit" class="button btn btn-primary form-control" name="AddFilter" value="Add Filter">
<span class="loading">Loading...</span>
@@ -53,7 +53,7 @@
<div class="chooser">
-<h1>Chooser</h1>
+<h3>Chooser</h3>
<p><i>A chooser selects a single owner from the filtered set of eligible users.</i></p>
@@ -61,7 +61,7 @@
% my $name = $chooser_config->{_name};
% my $prefix = "Chooser_${name}";
-<select name="ChooserType">
+<select name="ChooserType" class="selectpicker">
% for my $chooser (@choosers) {
% my $class = "RT::Extension::AutomaticAssignment::Chooser::$chooser";
@@ -83,7 +83,11 @@
</div>
-<& /Elements/Submit, Name => 'Update', Label => loc('Save Changes') &>
+<div class="form-row">
+ <div class="col-12">
+ <& /Elements/Submit, Name => 'Update', Label => loc('Save Changes') &>
+ </div>
+</div>
</form>
diff --git a/html/Admin/Queues/Elements/Chooser/UserDefined b/html/Admin/Queues/Elements/Chooser/UserDefined
index 42676f9..61a2496 100644
--- a/html/Admin/Queues/Elements/Chooser/UserDefined
+++ b/html/Admin/Queues/Elements/Chooser/UserDefined
@@ -1,6 +1,6 @@
<&| /Admin/Queues/Elements/SortableBox, prefix => $prefix, is_filter => 0, class_name => 'UserDefined' &>
<p>This chooser selects a user from the pool of eligible owners based on the provided Perl code. The variable <tt>@Users</tt> contains the list of eligible owners and <tt>$Ticket</tt> is the ticket which is being assigned. The code should return an <tt>RT::User</tt> object from the <tt>@Users</tt> array to choose that user as owner.</p>
-<textarea cols=80 rows=7 id="<% $prefix %>_code" name="<% $prefix %>_code"><% $config->{code} %></textarea>
+<textarea cols=80 rows=7 id="<% $prefix %>_code" name="<% $prefix %>_code" class="form-control"><% $config->{code} %></textarea>
</&>
<%ARGS>
$prefix
diff --git a/html/Admin/Queues/Elements/Filter/ExcludedDates b/html/Admin/Queues/Elements/Filter/ExcludedDates
index 1d0335b..cb36554 100644
--- a/html/Admin/Queues/Elements/Filter/ExcludedDates
+++ b/html/Admin/Queues/Elements/Filter/ExcludedDates
@@ -2,30 +2,33 @@
<p>This filter selects eligible owners by datetime custom fields on users, meant for scheduled vacations. If the current date and time falls between the following two custom fields, the user will be excluded from automatic assignment.</p>
% if ($user_cfs->Count) {
-<table>
-<tr>
-<td class="label"><label for="<% $prefix %>_begin">Begin Custom Field:</label></td>
-<td class="value">
-<select id="<% $prefix %>_begin" name="<% $prefix %>_begin">
-<option value="">-</option>
-% while (my $cf = $user_cfs->Next) {
-<option <% ($config->{begin}||0) == $cf->Id ? "selected" : "" %> value="<% $cf->Id %>"><% $cf->Name %></option>
-% }
-</select>
-</td>
-</tr>
-<tr>
-<td class="label"><label for="<% $prefix %>_end">End Custom Field:</label></td>
-<td class="value">
-<select id="<% $prefix %>_end" name="<% $prefix %>_end">
-<option value="">-</option>
-% while (my $cf = $user_cfs->Next) {
-<option <% ($config->{end}||0) == $cf->Id ? "selected" : "" %> value="<% $cf->Id %>"><% $cf->Name %></option>
-% }
-</select>
-</td>
-</tr>
-</table>
+<div class="form-row">
+ <div class="col-3 label">
+ <&|/l&>Begin Custom Field</&>:
+ </div>
+ <div class="col-9 value">
+ <select id="<% $prefix %>_begin" name="<% $prefix %>_begin" class="selectpicker form-control">
+ <option value="">-</option>
+% while (my $cf = $user_cfs->Next) {
+ <option <% ($config->{begin}||0) == $cf->Id ? "selected" : "" %> value="<% $cf->Id %>"><% $cf->Name %></option>
+% }
+ </select>
+ </div>
+</div>
+
+<div class="form-row">
+ <div class="col-3 label">
+ <&|/l&>End Custom Field</&>:
+ </div>
+ <div class="col-9 value">
+ <select id="<% $prefix %>_end" name="<% $prefix %>_end" class="selectpicker form-control">
+ <option value="">-</option>
+% while (my $cf = $user_cfs->Next) {
+ <option <% ($config->{end}||0) == $cf->Id ? "selected" : "" %> value="<% $cf->Id %>"><% $cf->Name %></option>
+% }
+ </select>
+ </div>
+</div>
% } else {
<p>No user custom fields found.</p>
% }
diff --git a/html/Admin/Queues/Elements/Filter/MemberOfGroup b/html/Admin/Queues/Elements/Filter/MemberOfGroup
index 5dc1e4f..fa312ce 100644
--- a/html/Admin/Queues/Elements/Filter/MemberOfGroup
+++ b/html/Admin/Queues/Elements/Filter/MemberOfGroup
@@ -2,19 +2,19 @@
<p>This filter selects eligible owners by their group membership. Only members of the following group will be automatically assigned tickets.</p>
% if ($groups->Count) {
-<table>
-<tr>
-<td class="label"><label for="<% $prefix %>_group">Group:</label></td>
-<td class="value">
-<select id="<% $prefix %>_group" name="<% $prefix %>_group">
-<option value="">-</option>
-% while (my $group = $groups->Next) {
-<option <% ($config->{group}||0) == $group->Id ? "selected" : "" %> value="<% $group->Id %>"><% $group->Name %></option>
-% }
-</select>
-</td>
-</tr>
-</table>
+<div class="form-row">
+ <div class="col-3 label">
+ <&|/l&>Group</&>:
+ </div>
+ <div class="col-9 value">
+ <select id="<% $prefix %>_group" name="<% $prefix %>_group" class="form-control selectpicker">
+ <option value="">-</option>
+% while (my $group = $groups->Next) {
+ <option <% ($config->{group}||0) == $group->Id ? "selected" : "" %> value="<% $group->Id %>"><% $group->Name %></option>
+% }
+ </select>
+ </div>
+</div>
% } else {
<p>No groups found.</p>
% }
diff --git a/html/Admin/Queues/Elements/Filter/MemberOfRole b/html/Admin/Queues/Elements/Filter/MemberOfRole
index 03731e0..afbb38d 100644
--- a/html/Admin/Queues/Elements/Filter/MemberOfRole
+++ b/html/Admin/Queues/Elements/Filter/MemberOfRole
@@ -1,24 +1,24 @@
<&| /Admin/Queues/Elements/SortableBox, prefix => $prefix, is_filter => 1, class_name => 'MemberOfRole' &>
<p>This filter selects eligible owners by their role membership. Only members of the following role, either on the queue or on the ticket itself, will be automatically assigned tickets.</p>
-<table>
-<tr>
-<td class="label"><label for="<% $prefix %>_role">Role:</label></td>
-<td class="value">
-<select id="<% $prefix %>_role" name="<% $prefix %>_role">
-<option value="">-</option>
-% for my $role (qw/AdminCc Cc Requestor/) {
-<option <% ($config->{role}||'') eq $role ? "selected" : "" %> value="<% $role %>"><% $role %></option>
-% }
+<div class="form-row">
+ <div class="col-3 label">
+ <&|/l&>Role</&>:
+ </div>
+ <div class="col-9 value">
+ <select id="<% $prefix %>_role" name="<% $prefix %>_role" class="selectpicker form-control">
+ <option value="">-</option>
+% for my $role (qw/AdminCc Cc Requestor/) {
+ <option <% ($config->{role}||'') eq $role ? "selected" : "" %> value="<% $role %>"><% $role %></option>
+% }
% if ($custom_roles) {
-% while (my $role = $custom_roles->Next) {
-<option <% ($config->{role}||0) eq $role->Id ? "selected" : "" %> value="<% $role->Id %>"><% $role->Name %></option>
-% }
+% while (my $role = $custom_roles->Next) {
+ <option <% ($config->{role}||0) eq $role->Id ? "selected" : "" %> value="<% $role->Id %>"><% $role->Name %></option>
+% }
% }
-</select>
-</td>
-</tr>
-</table>
+ </select>
+ </div>
+</div>
</&>
<%INIT>
diff --git a/html/Admin/Queues/Elements/Filter/UserDefined b/html/Admin/Queues/Elements/Filter/UserDefined
index 2d60446..48c2e8a 100644
--- a/html/Admin/Queues/Elements/Filter/UserDefined
+++ b/html/Admin/Queues/Elements/Filter/UserDefined
@@ -1,6 +1,6 @@
<&| /Admin/Queues/Elements/SortableBox, prefix => $prefix, is_filter => 1, class_name => 'UserDefined', &>
<p>This filter selects eligible owners based on the provided Perl code. The code is evaluated for each <tt>$User</tt>. The code should return 1 to include that user, or 0 to exclude. The variable <tt>@Users</tt> contains the list of all potential owners and <tt>$Ticket</tt> is the ticket which is being assigned.</p>
-<textarea cols=80 rows=7 id="<% $prefix %>_code" name="<% $prefix %>_code"><% $config->{code} %></textarea>
+<textarea cols=80 rows=7 id="<% $prefix %>_code" name="<% $prefix %>_code" class="form-control"><% $config->{code} %></textarea>
</&>
<%ARGS>
$prefix
diff --git a/html/Admin/Queues/Elements/Filter/WorkSchedule b/html/Admin/Queues/Elements/Filter/WorkSchedule
index 9a5577c..06efaca 100644
--- a/html/Admin/Queues/Elements/Filter/WorkSchedule
+++ b/html/Admin/Queues/Elements/Filter/WorkSchedule
@@ -2,19 +2,19 @@
<p>This filter selects eligible owners by their work schedule. The following user custom field decides which work schedule each user maintains. Administrators may update the <tt>%ServiceBusinessHours</tt> RT config for adding or modifying the available schedules.</p>
% if ($user_cfs->Count) {
-<table>
-<tr>
-<td class="label"><label for="<% $prefix %>_user_cf">Custom Field:</label></td>
-<td class="value">
-<select id="<% $prefix %>_user_cf" name="<% $prefix %>_user_cf">
-<option value="">-</option>
-% while (my $cf = $user_cfs->Next) {
-<option <% ($config->{user_cf}||0) == $cf->Id ? "selected" : "" %> value="<% $cf->Id %>"><% $cf->Name %></option>
-% }
-</select>
-</td>
-</tr>
-</table>
+<div class="form-row">
+ <div class="col-3 label">
+ <&|/l&>Custom Field</&>:
+ </div>
+ <div class="col-9 value">
+ <select id="<% $prefix %>_user_cf" name="<% $prefix %>_user_cf" class="selectpicker form-control">
+ <option value="">-</option>
+% while (my $cf = $user_cfs->Next) {
+ <option <% ($config->{user_cf}||0) == $cf->Id ? "selected" : "" %> value="<% $cf->Id %>"><% $cf->Name %></option>
+% }
+ </select>
+ </div>
+</div>
% } else {
<p>No user custom fields found.</p>
% }
diff --git a/html/Admin/Queues/Elements/SortableBox b/html/Admin/Queues/Elements/SortableBox
index 1d67031..1d31928 100644
--- a/html/Admin/Queues/Elements/SortableBox
+++ b/html/Admin/Queues/Elements/SortableBox
@@ -1,14 +1,12 @@
<div data-prefix="<% $prefix %>" class="sortable-box">
+<&|/Widgets/TitleBox, title => $class->Description, titleright_raw => $title_right &>
<input type="hidden" class="hidden" name="<% $prefix %>" value="1" />
<input type="hidden" class="hidden" name="<% $prefix %>_ClassName" value="<% $class_name %>" />
-<h3><% $class->Description %>
-% if ($allow_remove) {
-<a href="#" class="remove"><img src="<% RT->Config->Get('WebPath') %>/static/images/remove.png"></a>
-% }
-</h3>
<div class="inner">
<% $m->content | n %>
</div>
+
+</&>
</div>
<%INIT>
my $class;
@@ -24,7 +22,14 @@ unless ($class->require) {
$m->abort;
}
-my $allow_remove = $is_filter;
+my $title_right
+ = $is_filter
+ ? ( '<a href="#" class="remove"><span class="fas fa-times icon-bordered fa-2x" alt="'
+ . loc('Delete')
+ . '" data-original-title="'
+ . loc('Delete')
+ . '" data-toggle="tooltip" data-placement="top"></span></a>' )
+ : '';
</%INIT>
<%ARGS>
$is_filter
diff --git a/lib/RT/Extension/AutomaticAssignment.pm b/lib/RT/Extension/AutomaticAssignment.pm
index ae01bb5..9521974 100644
--- a/lib/RT/Extension/AutomaticAssignment.pm
+++ b/lib/RT/Extension/AutomaticAssignment.pm
@@ -4,8 +4,6 @@ use warnings;
our $VERSION = '0.04';
-RT->AddJavaScript('jquery.ui.sortable.js');
-
RT->AddStyleSheets("automatic-assignment.css");
RT->AddJavaScript("automatic-assignment.js");
@@ -221,7 +219,7 @@ RT-Extension-AutomaticAssignment - automatically assign tickets based on rules
=head1 INSTALLATION
-RT-Extension-AutomaticAssignment requires version RT 4.2.0 or later.
+RT-Extension-AutomaticAssignment requires version RT 5.0 or later.
=over
diff --git a/static/css/automatic-assignment.css b/static/css/automatic-assignment.css
index b4ff453..ff545be 100644
--- a/static/css/automatic-assignment.css
+++ b/static/css/automatic-assignment.css
@@ -1,14 +1,6 @@
-form.automatic-assignment {
- max-width: 700px;
-}
-
.sortable-box,
.sortable-placeholder {
- border-style: solid;
- border-width: 1.5px;
margin: 5px;
- border-color: #aaa;
- background-color: #eee;
}
.sortable-placeholder {
@@ -25,10 +17,6 @@ form.automatic-assignment {
padding: 5px 0 0 5px;
}
-.sortable-box select {
- min-width: 10em;
-}
-
.replacing .sortable-box {
-webkit-filter: grayscale(80%);
filter: grayscale(80%);
@@ -45,15 +33,6 @@ form.automatic-assignment {
visibility: visible;
}
-.sortable-box .remove {
- float: right;
-}
-
-.sortable-box .remove img {
- height: 1em;
- width: 1em;
-}
-
form.automatic-assignment textarea {
font-family: monospace;
}
diff --git a/static/images/remove.png b/static/images/remove.png
deleted file mode 100644
index e565bb8..0000000
Binary files a/static/images/remove.png and /dev/null differ
diff --git a/static/js/automatic-assignment.js b/static/js/automatic-assignment.js
index ed2ec88..44ab759 100644
--- a/static/js/automatic-assignment.js
+++ b/static/js/automatic-assignment.js
@@ -43,6 +43,7 @@ jQuery(function () {
filterContainer.removeClass('adding');
addFilterSelect.val('').attr('disabled', false);
addFilterButton.attr('disabled', false);
+ jQuery('.selectpicker').selectpicker('refresh');
},
error: function (xhr, reason) {
alert(reason);
diff --git a/static/js/jquery.ui.sortable.js b/static/js/jquery.ui.sortable.js
deleted file mode 100644
index 1ade1e3..0000000
--- a/static/js/jquery.ui.sortable.js
+++ /dev/null
@@ -1,1250 +0,0 @@
-/*!
- * jQuery UI Sortable 1.10.0
- * http://jqueryui.com
- *
- * Copyright 2013 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/sortable/
- *
- * Depends:
- * jquery.ui.core.js
- * jquery.ui.mouse.js
- * jquery.ui.widget.js
- */
-(function( $, undefined ) {
-
-/*jshint loopfunc: true */
-
-function isOverAxis( x, reference, size ) {
- return ( x > reference ) && ( x < ( reference + size ) );
-}
-
-$.widget("ui.sortable", $.ui.mouse, {
- version: "1.10.0",
- widgetEventPrefix: "sort",
- ready: false,
- options: {
- appendTo: "parent",
- axis: false,
- connectWith: false,
- containment: false,
- cursor: "auto",
- cursorAt: false,
- dropOnEmpty: true,
- forcePlaceholderSize: false,
- forceHelperSize: false,
- grid: false,
- handle: false,
- helper: "original",
- items: "> *",
- opacity: false,
- placeholder: false,
- revert: false,
- scroll: true,
- scrollSensitivity: 20,
- scrollSpeed: 20,
- scope: "default",
- tolerance: "intersect",
- zIndex: 1000,
-
- // callbacks
- activate: null,
- beforeStop: null,
- change: null,
- deactivate: null,
- out: null,
- over: null,
- receive: null,
- remove: null,
- sort: null,
- start: null,
- stop: null,
- update: null
- },
- _create: function() {
-
- var o = this.options;
- this.containerCache = {};
- this.element.addClass("ui-sortable");
-
- //Get the items
- this.refresh();
-
- //Let's determine if the items are being displayed horizontally
- this.floating = this.items.length ? o.axis === "x" || (/left|right/).test(this.items[0].item.css("float")) || (/inline|table-cell/).test(this.items[0].item.css("display")) : false;
-
- //Let's determine the parent's offset
- this.offset = this.element.offset();
-
- //Initialize mouse events for interaction
- this._mouseInit();
-
- //We're ready to go
- this.ready = true;
-
- },
-
- _destroy: function() {
- this.element
- .removeClass("ui-sortable ui-sortable-disabled");
- this._mouseDestroy();
-
- for ( var i = this.items.length - 1; i >= 0; i-- ) {
- this.items[i].item.removeData(this.widgetName + "-item");
- }
-
- return this;
- },
-
- _setOption: function(key, value){
- if ( key === "disabled" ) {
- this.options[ key ] = value;
-
- this.widget().toggleClass( "ui-sortable-disabled", !!value );
- } else {
- // Don't call widget base _setOption for disable as it adds ui-state-disabled class
- $.Widget.prototype._setOption.apply(this, arguments);
- }
- },
-
- _mouseCapture: function(event, overrideHandle) {
- var currentItem = null,
- validHandle = false,
- that = this;
-
- if (this.reverting) {
- return false;
- }
-
- if(this.options.disabled || this.options.type === "static") {
- return false;
- }
-
- //We have to refresh the items data once first
- this._refreshItems(event);
-
- //Find out if the clicked node (or one of its parents) is a actual item in this.items
- $(event.target).parents().each(function() {
- if($.data(this, that.widgetName + "-item") === that) {
- currentItem = $(this);
- return false;
- }
- });
- if($.data(event.target, that.widgetName + "-item") === that) {
- currentItem = $(event.target);
- }
-
- if(!currentItem) {
- return false;
- }
- if(this.options.handle && !overrideHandle) {
- $(this.options.handle, currentItem).find("*").addBack().each(function() {
- if(this === event.target) {
- validHandle = true;
- }
- });
- if(!validHandle) {
- return false;
- }
- }
-
- this.currentItem = currentItem;
- this._removeCurrentsFromItems();
- return true;
-
- },
-
- _mouseStart: function(event, overrideHandle, noActivation) {
-
- var i,
- o = this.options;
-
- this.currentContainer = this;
-
- //We only need to call refreshPositions, because the refreshItems call has been moved to mouseCapture
- this.refreshPositions();
-
- //Create and append the visible helper
- this.helper = this._createHelper(event);
-
- //Cache the helper size
- this._cacheHelperProportions();
-
- /*
- * - Position generation -
- * This block generates everything position related - it's the core of draggables.
- */
-
- //Cache the margins of the original element
- this._cacheMargins();
-
- //Get the next scrolling parent
- this.scrollParent = this.helper.scrollParent();
-
- //The element's absolute position on the page minus margins
- this.offset = this.currentItem.offset();
- this.offset = {
- top: this.offset.top - this.margins.top,
- left: this.offset.left - this.margins.left
- };
-
- $.extend(this.offset, {
- click: { //Where the click happened, relative to the element
- left: event.pageX - this.offset.left,
- top: event.pageY - this.offset.top
- },
- parent: this._getParentOffset(),
- relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
- });
-
- // Only after we got the offset, we can change the helper's position to absolute
- // TODO: Still need to figure out a way to make relative sorting possible
- this.helper.css("position", "absolute");
- this.cssPosition = this.helper.css("position");
-
- //Generate the original position
- this.originalPosition = this._generatePosition(event);
- this.originalPageX = event.pageX;
- this.originalPageY = event.pageY;
-
- //Adjust the mouse offset relative to the helper if "cursorAt" is supplied
- (o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
-
- //Cache the former DOM position
- this.domPosition = { prev: this.currentItem.prev()[0], parent: this.currentItem.parent()[0] };
-
- //If the helper is not the original, hide the original so it's not playing any role during the drag, won't cause anything bad this way
- if(this.helper[0] !== this.currentItem[0]) {
- this.currentItem.hide();
- }
-
- //Create the placeholder
- this._createPlaceholder();
-
- //Set a containment if given in the options
- if(o.containment) {
- this._setContainment();
- }
-
- if(o.cursor) { // cursor option
- if ($("body").css("cursor")) {
- this._storedCursor = $("body").css("cursor");
- }
- $("body").css("cursor", o.cursor);
- }
-
- if(o.opacity) { // opacity option
- if (this.helper.css("opacity")) {
- this._storedOpacity = this.helper.css("opacity");
- }
- this.helper.css("opacity", o.opacity);
- }
-
- if(o.zIndex) { // zIndex option
- if (this.helper.css("zIndex")) {
- this._storedZIndex = this.helper.css("zIndex");
- }
- this.helper.css("zIndex", o.zIndex);
- }
-
- //Prepare scrolling
- if(this.scrollParent[0] !== document && this.scrollParent[0].tagName !== "HTML") {
- this.overflowOffset = this.scrollParent.offset();
- }
-
- //Call callbacks
- this._trigger("start", event, this._uiHash());
-
- //Recache the helper size
- if(!this._preserveHelperProportions) {
- this._cacheHelperProportions();
- }
-
-
- //Post "activate" events to possible containers
- if( !noActivation ) {
- for ( i = this.containers.length - 1; i >= 0; i-- ) {
- this.containers[ i ]._trigger( "activate", event, this._uiHash( this ) );
- }
- }
-
- //Prepare possible droppables
- if($.ui.ddmanager) {
- $.ui.ddmanager.current = this;
- }
-
- if ($.ui.ddmanager && !o.dropBehaviour) {
- $.ui.ddmanager.prepareOffsets(this, event);
- }
-
- this.dragging = true;
-
- this.helper.addClass("ui-sortable-helper");
- this._mouseDrag(event); //Execute the drag once - this causes the helper not to be visible before getting its correct position
- return true;
-
- },
-
- _mouseDrag: function(event) {
- var i, item, itemElement, intersection,
- o = this.options,
- scrolled = false;
-
- //Compute the helpers position
- this.position = this._generatePosition(event);
- this.positionAbs = this._convertPositionTo("absolute");
-
- if (!this.lastPositionAbs) {
- this.lastPositionAbs = this.positionAbs;
- }
-
- //Do scrolling
- if(this.options.scroll) {
- if(this.scrollParent[0] !== document && this.scrollParent[0].tagName !== "HTML") {
-
- if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
- this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
- } else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity) {
- this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
- }
-
- if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity) {
- this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
- } else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity) {
- this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
- }
-
- } else {
-
- if(event.pageY - $(document).scrollTop() < o.scrollSensitivity) {
- scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
- } else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) {
- scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
- }
-
- if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity) {
- scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
- } else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) {
- scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
- }
-
- }
-
- if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour) {
- $.ui.ddmanager.prepareOffsets(this, event);
- }
- }
-
- //Regenerate the absolute position used for position checks
- this.positionAbs = this._convertPositionTo("absolute");
-
- //Set the helper position
- if(!this.options.axis || this.options.axis !== "y") {
- this.helper[0].style.left = this.position.left+"px";
- }
- if(!this.options.axis || this.options.axis !== "x") {
- this.helper[0].style.top = this.position.top+"px";
- }
-
- //Rearrange
- for (i = this.items.length - 1; i >= 0; i--) {
-
- //Cache variables and intersection, continue if no intersection
- item = this.items[i];
- itemElement = item.item[0];
- intersection = this._intersectsWithPointer(item);
- if (!intersection) {
- continue;
- }
-
- // Only put the placeholder inside the current Container, skip all
- // items form other containers. This works because when moving
- // an item from one container to another the
- // currentContainer is switched before the placeholder is moved.
- //
- // Without this moving items in "sub-sortables" can cause the placeholder to jitter
- // beetween the outer and inner container.
- if (item.instance !== this.currentContainer) {
- continue;
- }
-
- // cannot intersect with itself
- // no useless actions that have been done before
- // no action if the item moved is the parent of the item checked
- if (itemElement !== this.currentItem[0] &&
- this.placeholder[intersection === 1 ? "next" : "prev"]()[0] !== itemElement &&
- !$.contains(this.placeholder[0], itemElement) &&
- (this.options.type === "semi-dynamic" ? !$.contains(this.element[0], itemElement) : true)
- ) {
-
- this.direction = intersection === 1 ? "down" : "up";
-
- if (this.options.tolerance === "pointer" || this._intersectsWithSides(item)) {
- this._rearrange(event, item);
- } else {
- break;
- }
-
- this._trigger("change", event, this._uiHash());
- break;
- }
- }
-
- //Post events to containers
- this._contactContainers(event);
-
- //Interconnect with droppables
- if($.ui.ddmanager) {
- $.ui.ddmanager.drag(this, event);
- }
-
- //Call callbacks
- this._trigger("sort", event, this._uiHash());
-
- this.lastPositionAbs = this.positionAbs;
- return false;
-
- },
-
- _mouseStop: function(event, noPropagation) {
-
- if(!event) {
- return;
- }
-
- //If we are using droppables, inform the manager about the drop
- if ($.ui.ddmanager && !this.options.dropBehaviour) {
- $.ui.ddmanager.drop(this, event);
- }
-
- if(this.options.revert) {
- var that = this,
- cur = this.placeholder.offset();
-
- this.reverting = true;
-
- $(this.helper).animate({
- left: cur.left - this.offset.parent.left - this.margins.left + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollLeft),
- top: cur.top - this.offset.parent.top - this.margins.top + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollTop)
- }, parseInt(this.options.revert, 10) || 500, function() {
- that._clear(event);
- });
- } else {
- this._clear(event, noPropagation);
- }
-
- return false;
-
- },
-
- cancel: function() {
-
- if(this.dragging) {
-
- this._mouseUp({ target: null });
-
- if(this.options.helper === "original") {
- this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
- } else {
- this.currentItem.show();
- }
-
- //Post deactivating events to containers
- for (var i = this.containers.length - 1; i >= 0; i--){
- this.containers[i]._trigger("deactivate", null, this._uiHash(this));
- if(this.containers[i].containerCache.over) {
- this.containers[i]._trigger("out", null, this._uiHash(this));
- this.containers[i].containerCache.over = 0;
- }
- }
-
- }
-
- if (this.placeholder) {
- //$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
- if(this.placeholder[0].parentNode) {
- this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
- }
- if(this.options.helper !== "original" && this.helper && this.helper[0].parentNode) {
- this.helper.remove();
- }
-
- $.extend(this, {
- helper: null,
- dragging: false,
- reverting: false,
- _noFinalSort: null
- });
-
- if(this.domPosition.prev) {
- $(this.domPosition.prev).after(this.currentItem);
- } else {
- $(this.domPosition.parent).prepend(this.currentItem);
- }
- }
-
- return this;
-
- },
-
- serialize: function(o) {
-
- var items = this._getItemsAsjQuery(o && o.connected),
- str = [];
- o = o || {};
-
- $(items).each(function() {
- var res = ($(o.item || this).attr(o.attribute || "id") || "").match(o.expression || (/(.+)[\-=_](.+)/));
- if (res) {
- str.push((o.key || res[1]+"[]")+"="+(o.key && o.expression ? res[1] : res[2]));
- }
- });
-
- if(!str.length && o.key) {
- str.push(o.key + "=");
- }
-
- return str.join("&");
-
- },
-
- toArray: function(o) {
-
- var items = this._getItemsAsjQuery(o && o.connected),
- ret = [];
-
- o = o || {};
-
- items.each(function() { ret.push($(o.item || this).attr(o.attribute || "id") || ""); });
- return ret;
-
- },
-
- /* Be careful with the following core functions */
- _intersectsWith: function(item) {
-
- var x1 = this.positionAbs.left,
- x2 = x1 + this.helperProportions.width,
- y1 = this.positionAbs.top,
- y2 = y1 + this.helperProportions.height,
- l = item.left,
- r = l + item.width,
- t = item.top,
- b = t + item.height,
- dyClick = this.offset.click.top,
- dxClick = this.offset.click.left,
- isOverElement = (y1 + dyClick) > t && (y1 + dyClick) < b && (x1 + dxClick) > l && (x1 + dxClick) < r;
-
- if ( this.options.tolerance === "pointer" ||
- this.options.forcePointerForContainers ||
- (this.options.tolerance !== "pointer" && this.helperProportions[this.floating ? "width" : "height"] > item[this.floating ? "width" : "height"])
- ) {
- return isOverElement;
- } else {
-
- return (l < x1 + (this.helperProportions.width / 2) && // Right Half
- x2 - (this.helperProportions.width / 2) < r && // Left Half
- t < y1 + (this.helperProportions.height / 2) && // Bottom Half
- y2 - (this.helperProportions.height / 2) < b ); // Top Half
-
- }
- },
-
- _intersectsWithPointer: function(item) {
-
- var isOverElementHeight = (this.options.axis === "x") || isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
- isOverElementWidth = (this.options.axis === "y") || isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
- isOverElement = isOverElementHeight && isOverElementWidth,
- verticalDirection = this._getDragVerticalDirection(),
- horizontalDirection = this._getDragHorizontalDirection();
-
- if (!isOverElement) {
- return false;
- }
-
- return this.floating ?
- ( ((horizontalDirection && horizontalDirection === "right") || verticalDirection === "down") ? 2 : 1 )
- : ( verticalDirection && (verticalDirection === "down" ? 2 : 1) );
-
- },
-
- _intersectsWithSides: function(item) {
-
- var isOverBottomHalf = isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height/2), item.height),
- isOverRightHalf = isOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width/2), item.width),
- verticalDirection = this._getDragVerticalDirection(),
- horizontalDirection = this._getDragHorizontalDirection();
-
- if (this.floating && horizontalDirection) {
- return ((horizontalDirection === "right" && isOverRightHalf) || (horizontalDirection === "left" && !isOverRightHalf));
- } else {
- return verticalDirection && ((verticalDirection === "down" && isOverBottomHalf) || (verticalDirection === "up" && !isOverBottomHalf));
- }
-
- },
-
- _getDragVerticalDirection: function() {
- var delta = this.positionAbs.top - this.lastPositionAbs.top;
- return delta !== 0 && (delta > 0 ? "down" : "up");
- },
-
- _getDragHorizontalDirection: function() {
- var delta = this.positionAbs.left - this.lastPositionAbs.left;
- return delta !== 0 && (delta > 0 ? "right" : "left");
- },
-
- refresh: function(event) {
- this._refreshItems(event);
- this.refreshPositions();
- return this;
- },
-
- _connectWith: function() {
- var options = this.options;
- return options.connectWith.constructor === String ? [options.connectWith] : options.connectWith;
- },
-
- _getItemsAsjQuery: function(connected) {
-
- var i, j, cur, inst,
- items = [],
- queries = [],
- connectWith = this._connectWith();
-
- if(connectWith && connected) {
- for (i = connectWith.length - 1; i >= 0; i--){
- cur = $(connectWith[i]);
- for ( j = cur.length - 1; j >= 0; j--){
- inst = $.data(cur[j], this.widgetFullName);
- if(inst && inst !== this && !inst.options.disabled) {
- queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), inst]);
- }
- }
- }
- }
-
- queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), this]);
-
- for (i = queries.length - 1; i >= 0; i--){
- queries[i][0].each(function() {
- items.push(this);
- });
- }
-
- return $(items);
-
- },
-
- _removeCurrentsFromItems: function() {
-
- var list = this.currentItem.find(":data(" + this.widgetName + "-item)");
-
- this.items = $.grep(this.items, function (item) {
- for (var j=0; j < list.length; j++) {
- if(list[j] === item.item[0]) {
- return false;
- }
- }
- return true;
- });
-
- },
-
- _refreshItems: function(event) {
-
- this.items = [];
- this.containers = [this];
-
- var i, j, cur, inst, targetData, _queries, item, queriesLength,
- items = this.items,
- queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items, this.element), this]],
- connectWith = this._connectWith();
-
- if(connectWith && this.ready) { //Shouldn't be run the first time through due to massive slow-down
- for (i = connectWith.length - 1; i >= 0; i--){
- cur = $(connectWith[i]);
- for (j = cur.length - 1; j >= 0; j--){
- inst = $.data(cur[j], this.widgetFullName);
- if(inst && inst !== this && !inst.options.disabled) {
- queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element[0], event, { item: this.currentItem }) : $(inst.options.items, inst.element), inst]);
- this.containers.push(inst);
- }
- }
- }
- }
-
- for (i = queries.length - 1; i >= 0; i--) {
- targetData = queries[i][1];
- _queries = queries[i][0];
-
- for (j=0, queriesLength = _queries.length; j < queriesLength; j++) {
- item = $(_queries[j]);
-
- item.data(this.widgetName + "-item", targetData); // Data for target checking (mouse manager)
-
- items.push({
- item: item,
- instance: targetData,
- width: 0, height: 0,
- left: 0, top: 0
- });
- }
- }
-
- },
-
- refreshPositions: function(fast) {
-
- //This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change
- if(this.offsetParent && this.helper) {
- this.offset.parent = this._getParentOffset();
- }
-
- var i, item, t, p;
-
- for (i = this.items.length - 1; i >= 0; i--){
- item = this.items[i];
-
- //We ignore calculating positions of all connected containers when we're not over them
- if(item.instance !== this.currentContainer && this.currentContainer && item.item[0] !== this.currentItem[0]) {
- continue;
- }
-
- t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
-
- if (!fast) {
- item.width = t.outerWidth();
- item.height = t.outerHeight();
- }
-
- p = t.offset();
- item.left = p.left;
- item.top = p.top;
- }
-
- if(this.options.custom && this.options.custom.refreshContainers) {
- this.options.custom.refreshContainers.call(this);
- } else {
- for (i = this.containers.length - 1; i >= 0; i--){
- p = this.containers[i].element.offset();
- this.containers[i].containerCache.left = p.left;
- this.containers[i].containerCache.top = p.top;
- this.containers[i].containerCache.width = this.containers[i].element.outerWidth();
- this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
- }
- }
-
- return this;
- },
-
- _createPlaceholder: function(that) {
- that = that || this;
- var className,
- o = that.options;
-
- if(!o.placeholder || o.placeholder.constructor === String) {
- className = o.placeholder;
- o.placeholder = {
- element: function() {
-
- var el = $(document.createElement(that.currentItem[0].nodeName))
- .addClass(className || that.currentItem[0].className+" ui-sortable-placeholder")
- .removeClass("ui-sortable-helper")[0];
-
- if(!className) {
- el.style.visibility = "hidden";
- }
-
- return el;
- },
- update: function(container, p) {
-
- // 1. If a className is set as 'placeholder option, we don't force sizes - the class is responsible for that
- // 2. The option 'forcePlaceholderSize can be enabled to force it even if a class name is specified
- if(className && !o.forcePlaceholderSize) {
- return;
- }
-
- //If the element doesn't have a actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item
- if(!p.height()) { p.height(that.currentItem.innerHeight() - parseInt(that.currentItem.css("paddingTop")||0, 10) - parseInt(that.currentItem.css("paddingBottom")||0, 10)); }
- if(!p.width()) { p.width(that.currentItem.innerWidth() - parseInt(that.currentItem.css("paddingLeft")||0, 10) - parseInt(that.currentItem.css("paddingRight")||0, 10)); }
- }
- };
- }
-
- //Create the placeholder
- that.placeholder = $(o.placeholder.element.call(that.element, that.currentItem));
-
- //Append it after the actual current item
- that.currentItem.after(that.placeholder);
-
- //Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317)
- o.placeholder.update(that, that.placeholder);
-
- },
-
- _contactContainers: function(event) {
- var i, j, dist, itemWithLeastDistance, posProperty, sizeProperty, base, cur, nearBottom,
- innermostContainer = null,
- innermostIndex = null;
-
- // get innermost container that intersects with item
- for (i = this.containers.length - 1; i >= 0; i--) {
-
- // never consider a container that's located within the item itself
- if($.contains(this.currentItem[0], this.containers[i].element[0])) {
- continue;
- }
-
- if(this._intersectsWith(this.containers[i].containerCache)) {
-
- // if we've already found a container and it's more "inner" than this, then continue
- if(innermostContainer && $.contains(this.containers[i].element[0], innermostContainer.element[0])) {
- continue;
- }
-
- innermostContainer = this.containers[i];
- innermostIndex = i;
-
- } else {
- // container doesn't intersect. trigger "out" event if necessary
- if(this.containers[i].containerCache.over) {
- this.containers[i]._trigger("out", event, this._uiHash(this));
- this.containers[i].containerCache.over = 0;
- }
- }
-
- }
-
- // if no intersecting containers found, return
- if(!innermostContainer) {
- return;
- }
-
- // move the item into the container if it's not there already
- if(this.containers.length === 1) {
- this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
- this.containers[innermostIndex].containerCache.over = 1;
- } else {
-
- //When entering a new container, we will find the item with the least distance and append our item near it
- dist = 10000;
- itemWithLeastDistance = null;
- posProperty = this.containers[innermostIndex].floating ? "left" : "top";
- sizeProperty = this.containers[innermostIndex].floating ? "width" : "height";
- base = this.positionAbs[posProperty] + this.offset.click[posProperty];
- for (j = this.items.length - 1; j >= 0; j--) {
- if(!$.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) {
- continue;
- }
- if(this.items[j].item[0] === this.currentItem[0]) {
- continue;
- }
- cur = this.items[j].item.offset()[posProperty];
- nearBottom = false;
- if(Math.abs(cur - base) > Math.abs(cur + this.items[j][sizeProperty] - base)){
- nearBottom = true;
- cur += this.items[j][sizeProperty];
- }
-
- if(Math.abs(cur - base) < dist) {
- dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j];
- this.direction = nearBottom ? "up": "down";
- }
- }
-
- //Check if dropOnEmpty is enabled
- if(!itemWithLeastDistance && !this.options.dropOnEmpty) {
- return;
- }
-
- this.currentContainer = this.containers[innermostIndex];
- itemWithLeastDistance ? this._rearrange(event, itemWithLeastDistance, null, true) : this._rearrange(event, null, this.containers[innermostIndex].element, true);
- this._trigger("change", event, this._uiHash());
- this.containers[innermostIndex]._trigger("change", event, this._uiHash(this));
-
- //Update the placeholder
- this.options.placeholder.update(this.currentContainer, this.placeholder);
-
- this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
- this.containers[innermostIndex].containerCache.over = 1;
- }
-
-
- },
-
- _createHelper: function(event) {
-
- var o = this.options,
- helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper === "clone" ? this.currentItem.clone() : this.currentItem);
-
- //Add the helper to the DOM if that didn't happen already
- if(!helper.parents("body").length) {
- $(o.appendTo !== "parent" ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]);
- }
-
- if(helper[0] === this.currentItem[0]) {
- this._storedCSS = { width: this.currentItem[0].style.width, height: this.currentItem[0].style.height, position: this.currentItem.css("position"), top: this.currentItem.css("top"), left: this.currentItem.css("left") };
- }
-
- if(!helper[0].style.width || o.forceHelperSize) {
- helper.width(this.currentItem.width());
- }
- if(!helper[0].style.height || o.forceHelperSize) {
- helper.height(this.currentItem.height());
- }
-
- return helper;
-
- },
-
- _adjustOffsetFromHelper: function(obj) {
- if (typeof obj === "string") {
- obj = obj.split(" ");
- }
- if ($.isArray(obj)) {
- obj = {left: +obj[0], top: +obj[1] || 0};
- }
- if ("left" in obj) {
- this.offset.click.left = obj.left + this.margins.left;
- }
- if ("right" in obj) {
- this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
- }
- if ("top" in obj) {
- this.offset.click.top = obj.top + this.margins.top;
- }
- if ("bottom" in obj) {
- this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
- }
- },
-
- _getParentOffset: function() {
-
-
- //Get the offsetParent and cache its position
- this.offsetParent = this.helper.offsetParent();
- var po = this.offsetParent.offset();
-
- // This is a special case where we need to modify a offset calculated on start, since the following happened:
- // 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
- // 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
- // the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
- if(this.cssPosition === "absolute" && this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
- po.left += this.scrollParent.scrollLeft();
- po.top += this.scrollParent.scrollTop();
- }
-
- // This needs to be actually done for all browsers, since pageX/pageY includes this information
- // with an ugly IE fix
- if( this.offsetParent[0] === document.body || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) {
- po = { top: 0, left: 0 };
- }
-
- return {
- top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
- left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
- };
-
- },
-
- _getRelativeOffset: function() {
-
- if(this.cssPosition === "relative") {
- var p = this.currentItem.position();
- return {
- top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
- left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
- };
- } else {
- return { top: 0, left: 0 };
- }
-
- },
-
- _cacheMargins: function() {
- this.margins = {
- left: (parseInt(this.currentItem.css("marginLeft"),10) || 0),
- top: (parseInt(this.currentItem.css("marginTop"),10) || 0)
- };
- },
-
- _cacheHelperProportions: function() {
- this.helperProportions = {
- width: this.helper.outerWidth(),
- height: this.helper.outerHeight()
- };
- },
-
- _setContainment: function() {
-
- var ce, co, over,
- o = this.options;
- if(o.containment === "parent") {
- o.containment = this.helper[0].parentNode;
- }
- if(o.containment === "document" || o.containment === "window") {
- this.containment = [
- 0 - this.offset.relative.left - this.offset.parent.left,
- 0 - this.offset.relative.top - this.offset.parent.top,
- $(o.containment === "document" ? document : window).width() - this.helperProportions.width - this.margins.left,
- ($(o.containment === "document" ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
- ];
- }
-
- if(!(/^(document|window|parent)$/).test(o.containment)) {
- ce = $(o.containment)[0];
- co = $(o.containment).offset();
- over = ($(ce).css("overflow") !== "hidden");
-
- this.containment = [
- co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left,
- co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top,
- co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left,
- co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top
- ];
- }
-
- },
-
- _convertPositionTo: function(d, pos) {
-
- if(!pos) {
- pos = this.position;
- }
- var mod = d === "absolute" ? 1 : -1,
- scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent,
- scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
-
- return {
- top: (
- pos.top + // The absolute mouse position
- this.offset.relative.top * mod + // Only for relative positioned nodes: Relative offset from element to offset parent
- this.offset.parent.top * mod - // The offsetParent's offset without borders (offset + border)
- ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
- ),
- left: (
- pos.left + // The absolute mouse position
- this.offset.relative.left * mod + // Only for relative positioned nodes: Relative offset from element to offset parent
- this.offset.parent.left * mod - // The offsetParent's offset without borders (offset + border)
- ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
- )
- };
-
- },
-
- _generatePosition: function(event) {
-
- var top, left,
- o = this.options,
- pageX = event.pageX,
- pageY = event.pageY,
- scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
-
- // This is another very weird special case that only happens for relative elements:
- // 1. If the css position is relative
- // 2. and the scroll parent is the document or similar to the offset parent
- // we have to refresh the relative offset during the scroll so there are no jumps
- if(this.cssPosition === "relative" && !(this.scrollParent[0] !== document && this.scrollParent[0] !== this.offsetParent[0])) {
- this.offset.relative = this._getRelativeOffset();
- }
-
- /*
- * - Position constraining -
- * Constrain the position to a mix of grid, containment.
- */
-
- if(this.originalPosition) { //If we are not dragging yet, we won't check for options
-
- if(this.containment) {
- if(event.pageX - this.offset.click.left < this.containment[0]) {
- pageX = this.containment[0] + this.offset.click.left;
- }
- if(event.pageY - this.offset.click.top < this.containment[1]) {
- pageY = this.containment[1] + this.offset.click.top;
- }
- if(event.pageX - this.offset.click.left > this.containment[2]) {
- pageX = this.containment[2] + this.offset.click.left;
- }
- if(event.pageY - this.offset.click.top > this.containment[3]) {
- pageY = this.containment[3] + this.offset.click.top;
- }
- }
-
- if(o.grid) {
- top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
- pageY = this.containment ? ( (top - this.offset.click.top >= this.containment[1] && top - this.offset.click.top <= this.containment[3]) ? top : ((top - this.offset.click.top >= this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
-
- left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
- pageX = this.containment ? ( (left - this.offset.click.left >= this.containment[0] && left - this.offset.click.left <= this.containment[2]) ? left : ((left - this.offset.click.left >= this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
- }
-
- }
-
- return {
- top: (
- pageY - // The absolute mouse position
- this.offset.click.top - // Click offset (relative to the element)
- this.offset.relative.top - // Only for relative positioned nodes: Relative offset from element to offset parent
- this.offset.parent.top + // The offsetParent's offset without borders (offset + border)
- ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
- ),
- left: (
- pageX - // The absolute mouse position
- this.offset.click.left - // Click offset (relative to the element)
- this.offset.relative.left - // Only for relative positioned nodes: Relative offset from element to offset parent
- this.offset.parent.left + // The offsetParent's offset without borders (offset + border)
- ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
- )
- };
-
- },
-
- _rearrange: function(event, i, a, hardRefresh) {
-
- a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0], (this.direction === "down" ? i.item[0] : i.item[0].nextSibling));
-
- //Various things done here to improve the performance:
- // 1. we create a setTimeout, that calls refreshPositions
- // 2. on the instance, we have a counter variable, that get's higher after every append
- // 3. on the local scope, we copy the counter variable, and check in the timeout, if it's still the same
- // 4. this lets only the last addition to the timeout stack through
- this.counter = this.counter ? ++this.counter : 1;
- var counter = this.counter;
-
- this._delay(function() {
- if(counter === this.counter) {
- this.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove
- }
- });
-
- },
-
- _clear: function(event, noPropagation) {
-
- this.reverting = false;
- // We delay all events that have to be triggered to after the point where the placeholder has been removed and
- // everything else normalized again
- var i,
- delayedTriggers = [];
-
- // We first have to update the dom position of the actual currentItem
- // Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088)
- if(!this._noFinalSort && this.currentItem.parent().length) {
- this.placeholder.before(this.currentItem);
- }
- this._noFinalSort = null;
-
- if(this.helper[0] === this.currentItem[0]) {
- for(i in this._storedCSS) {
- if(this._storedCSS[i] === "auto" || this._storedCSS[i] === "static") {
- this._storedCSS[i] = "";
- }
- }
- this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
- } else {
- this.currentItem.show();
- }
-
- if(this.fromOutside && !noPropagation) {
- delayedTriggers.push(function(event) { this._trigger("receive", event, this._uiHash(this.fromOutside)); });
- }
- if((this.fromOutside || this.domPosition.prev !== this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent !== this.currentItem.parent()[0]) && !noPropagation) {
- delayedTriggers.push(function(event) { this._trigger("update", event, this._uiHash()); }); //Trigger update callback if the DOM position has changed
- }
-
- // Check if the items Container has Changed and trigger appropriate
- // events.
- if (this !== this.currentContainer) {
- if(!noPropagation) {
- delayedTriggers.push(function(event) { this._trigger("remove", event, this._uiHash()); });
- delayedTriggers.push((function(c) { return function(event) { c._trigger("receive", event, this._uiHash(this)); }; }).call(this, this.currentContainer));
- delayedTriggers.push((function(c) { return function(event) { c._trigger("update", event, this._uiHash(this)); }; }).call(this, this.currentContainer));
- }
- }
-
-
- //Post events to containers
- for (i = this.containers.length - 1; i >= 0; i--){
- if(!noPropagation) {
- delayedTriggers.push((function(c) { return function(event) { c._trigger("deactivate", event, this._uiHash(this)); }; }).call(this, this.containers[i]));
- }
- if(this.containers[i].containerCache.over) {
- delayedTriggers.push((function(c) { return function(event) { c._trigger("out", event, this._uiHash(this)); }; }).call(this, this.containers[i]));
- this.containers[i].containerCache.over = 0;
- }
- }
-
- //Do what was originally in plugins
- if(this._storedCursor) {
- $("body").css("cursor", this._storedCursor);
- }
- if(this._storedOpacity) {
- this.helper.css("opacity", this._storedOpacity);
- }
- if(this._storedZIndex) {
- this.helper.css("zIndex", this._storedZIndex === "auto" ? "" : this._storedZIndex);
- }
-
- this.dragging = false;
- if(this.cancelHelperRemoval) {
- if(!noPropagation) {
- this._trigger("beforeStop", event, this._uiHash());
- for (i=0; i < delayedTriggers.length; i++) {
- delayedTriggers[i].call(this, event);
- } //Trigger all delayed events
- this._trigger("stop", event, this._uiHash());
- }
-
- this.fromOutside = false;
- return false;
- }
-
- if(!noPropagation) {
- this._trigger("beforeStop", event, this._uiHash());
- }
-
- //$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
- this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
-
- if(this.helper[0] !== this.currentItem[0]) {
- this.helper.remove();
- }
- this.helper = null;
-
- if(!noPropagation) {
- for (i=0; i < delayedTriggers.length; i++) {
- delayedTriggers[i].call(this, event);
- } //Trigger all delayed events
- this._trigger("stop", event, this._uiHash());
- }
-
- this.fromOutside = false;
- return true;
-
- },
-
- _trigger: function() {
- if ($.Widget.prototype._trigger.apply(this, arguments) === false) {
- this.cancel();
- }
- },
-
- _uiHash: function(_inst) {
- var inst = _inst || this;
- return {
- helper: inst.helper,
- placeholder: inst.placeholder || $([]),
- position: inst.position,
- originalPosition: inst.originalPosition,
- offset: inst.positionAbs,
- item: inst.currentItem,
- sender: _inst ? _inst.element : null
- };
- }
-
-});
-
-})(jQuery);
commit d4d41b406e0595c61e8e98dfe4c786914cc2c4b4
Author: sunnavy <sunnavy at bestpractical.com>
Date: Wed Jul 29 03:49:42 2020 +0800
Localize more strings
diff --git a/html/Admin/Queues/AutomaticAssignment.html b/html/Admin/Queues/AutomaticAssignment.html
index d56064a..707eb96 100644
--- a/html/Admin/Queues/AutomaticAssignment.html
+++ b/html/Admin/Queues/AutomaticAssignment.html
@@ -7,9 +7,9 @@
<div class="filters">
-<h3>Filters</h3>
+<h3><&|/l&>Filters</&></h3>
-<p><i>Filters reduce the pool of eligible owners. Each user must fulfill the requirements of all the filters below to be included in this queue's automatic assignment.</i></p>
+<p><i><&|/l&>Filters reduce the pool of eligible owners. Each user must fulfill the requirements of all the filters below to be included in this queue's automatic assignment.</&></i></p>
<select name="FilterType" class="selectpicker">
<option value="">-</option>
@@ -25,9 +25,9 @@
</select>
-<input type="submit" class="button btn btn-primary form-control" name="AddFilter" value="Add Filter">
+<input type="submit" class="button btn btn-primary form-control" name="AddFilter" value="<&|/l&>Add Filter</&>">
-<span class="loading">Loading...</span>
+<span class="loading"><&|/l&>Loading...</&></span>
<div class="filter-list">
@@ -53,9 +53,9 @@
<div class="chooser">
-<h3>Chooser</h3>
+<h3><&|/l&>Chooser</&></h3>
-<p><i>A chooser selects a single owner from the filtered set of eligible users.</i></p>
+<p><i><&|/l&>A chooser selects a single owner from the filtered set of eligible users.</&></i></p>
% my $chooser_config = $config->{chooser};
% my $name = $chooser_config->{_name};
@@ -139,7 +139,7 @@ my $config = $attr ? $attr->Content : {
my $scrips = RT::Extension::AutomaticAssignment->_ScripsForQueue($QueueObj);
if ($scrips->Count == 0) {
- push @results, "No scrips for automatic assignment are applied to this queue. Please see the AutomaticAssignment documentation for setup instructions.";
+ push @results, loc("No scrips for automatic assignment are applied to this queue. Please see the AutomaticAssignment documentation for setup instructions.");
}
</%INIT>
<%ARGS>
diff --git a/html/Admin/Queues/Elements/Chooser/ActiveTickets b/html/Admin/Queues/Elements/Chooser/ActiveTickets
index 1630e1b..e7c4473 100644
--- a/html/Admin/Queues/Elements/Chooser/ActiveTickets
+++ b/html/Admin/Queues/Elements/Chooser/ActiveTickets
@@ -1,5 +1,5 @@
<&| /Admin/Queues/Elements/SortableBox, prefix => $prefix, is_filter => 0, class_name => 'ActiveTickets' &>
-<p>This chooser selects the user with the fewest number of active tickets. If multiple users have the same number of tickets, then the ticket is assigned randomly to one of them.</p>
+<p><&|/l&>This chooser selects the user with the fewest number of active tickets. If multiple users have the same number of tickets, then the ticket is assigned randomly to one of them.</&></p>
</&>
<%ARGS>
$prefix
diff --git a/html/Admin/Queues/Elements/Chooser/Random b/html/Admin/Queues/Elements/Chooser/Random
index 036f066..167987b 100644
--- a/html/Admin/Queues/Elements/Chooser/Random
+++ b/html/Admin/Queues/Elements/Chooser/Random
@@ -1,5 +1,5 @@
<&| /Admin/Queues/Elements/SortableBox, prefix => $prefix, is_filter => 0, class_name => 'Random' &>
-<p>This chooser selects a random owner from the pool of eligible users.</p>
+<p><&|/l&>This chooser selects a random owner from the pool of eligible users.</&></p>
</&>
<%ARGS>
$prefix
diff --git a/html/Admin/Queues/Elements/Chooser/RoundRobin b/html/Admin/Queues/Elements/Chooser/RoundRobin
index 7472cd0..66493c5 100644
--- a/html/Admin/Queues/Elements/Chooser/RoundRobin
+++ b/html/Admin/Queues/Elements/Chooser/RoundRobin
@@ -1,5 +1,5 @@
<&| /Admin/Queues/Elements/SortableBox, prefix => $prefix, is_filter => 0, class_name => 'RoundRobin' &>
-<p>This chooser selects the user for whom it has been the longest amount of time since they were last automatically assigned a ticket in the same queue. This effectively distributes the tickets evenly between the userbase in a round robin fashion, even if users enter and leave the pool.</p>
+<p><&|/l&>This chooser selects the user for whom it has been the longest amount of time since they were last automatically assigned a ticket in the same queue. This effectively distributes the tickets evenly between the userbase in a round robin fashion, even if users enter and leave the pool.</&></p>
</&>
<%ARGS>
$prefix
diff --git a/html/Admin/Queues/Elements/Chooser/TimeLeft b/html/Admin/Queues/Elements/Chooser/TimeLeft
index 32db7fb..b9fa560 100644
--- a/html/Admin/Queues/Elements/Chooser/TimeLeft
+++ b/html/Admin/Queues/Elements/Chooser/TimeLeft
@@ -1,5 +1,5 @@
<&| /Admin/Queues/Elements/SortableBox, prefix => $prefix, is_filter => 0, class_name => 'TimeLeft' &>
-<p>This chooser selects the user with the least total amount of Time Left on their tickets in the given queue. If a particular ticket does not have Time Left, then that ticket's Time Estimated minus its Time Worked is used instead.</p>
+<p><&|/l&>This chooser selects the user with the least total amount of Time Left on their tickets in the given queue. If a particular ticket does not have Time Left, then that ticket's Time Estimated minus its Time Worked is used instead.</&></p>
</&>
<%ARGS>
$prefix
diff --git a/html/Admin/Queues/Elements/Chooser/UserDefined b/html/Admin/Queues/Elements/Chooser/UserDefined
index 61a2496..3abea56 100644
--- a/html/Admin/Queues/Elements/Chooser/UserDefined
+++ b/html/Admin/Queues/Elements/Chooser/UserDefined
@@ -1,5 +1,5 @@
<&| /Admin/Queues/Elements/SortableBox, prefix => $prefix, is_filter => 0, class_name => 'UserDefined' &>
-<p>This chooser selects a user from the pool of eligible owners based on the provided Perl code. The variable <tt>@Users</tt> contains the list of eligible owners and <tt>$Ticket</tt> is the ticket which is being assigned. The code should return an <tt>RT::User</tt> object from the <tt>@Users</tt> array to choose that user as owner.</p>
+<p><&|/l&>This chooser selects a user from the pool of eligible owners based on the provided Perl code. The variable <tt>@Users</tt> contains the list of eligible owners and <tt>$Ticket</tt> is the ticket which is being assigned. The code should return an <tt>RT::User</tt> object from the <tt>@Users</tt> array to choose that user as owner.</&></p>
<textarea cols=80 rows=7 id="<% $prefix %>_code" name="<% $prefix %>_code" class="form-control"><% $config->{code} %></textarea>
</&>
<%ARGS>
diff --git a/html/Admin/Queues/Elements/Filter/ExcludedDates b/html/Admin/Queues/Elements/Filter/ExcludedDates
index cb36554..3491646 100644
--- a/html/Admin/Queues/Elements/Filter/ExcludedDates
+++ b/html/Admin/Queues/Elements/Filter/ExcludedDates
@@ -1,5 +1,5 @@
<&| /Admin/Queues/Elements/SortableBox, prefix => $prefix, is_filter => 1, class_name => 'ExcludedDates' &>
-<p>This filter selects eligible owners by datetime custom fields on users, meant for scheduled vacations. If the current date and time falls between the following two custom fields, the user will be excluded from automatic assignment.</p>
+<p><&|/l&>This filter selects eligible owners by datetime custom fields on users, meant for scheduled vacations. If the current date and time falls between the following two custom fields, the user will be excluded from automatic assignment.</&></p>
% if ($user_cfs->Count) {
<div class="form-row">
@@ -30,7 +30,7 @@
</div>
</div>
% } else {
-<p>No user custom fields found.</p>
+<p><&|/l&>No user custom fields found.</&></p>
% }
</&>
<%INIT>
diff --git a/html/Admin/Queues/Elements/Filter/MemberOfGroup b/html/Admin/Queues/Elements/Filter/MemberOfGroup
index fa312ce..445e7be 100644
--- a/html/Admin/Queues/Elements/Filter/MemberOfGroup
+++ b/html/Admin/Queues/Elements/Filter/MemberOfGroup
@@ -1,5 +1,5 @@
<&| /Admin/Queues/Elements/SortableBox, prefix => $prefix, is_filter => 1, class_name => 'MemberOfGroup', &>
-<p>This filter selects eligible owners by their group membership. Only members of the following group will be automatically assigned tickets.</p>
+<p><&|/l&>This filter selects eligible owners by their group membership. Only members of the following group will be automatically assigned tickets.</&></p>
% if ($groups->Count) {
<div class="form-row">
@@ -16,7 +16,7 @@
</div>
</div>
% } else {
-<p>No groups found.</p>
+<p><&|/l&>No groups found.</&></p>
% }
</&>
<%INIT>
diff --git a/html/Admin/Queues/Elements/Filter/MemberOfRole b/html/Admin/Queues/Elements/Filter/MemberOfRole
index afbb38d..db16cf6 100644
--- a/html/Admin/Queues/Elements/Filter/MemberOfRole
+++ b/html/Admin/Queues/Elements/Filter/MemberOfRole
@@ -1,5 +1,5 @@
<&| /Admin/Queues/Elements/SortableBox, prefix => $prefix, is_filter => 1, class_name => 'MemberOfRole' &>
-<p>This filter selects eligible owners by their role membership. Only members of the following role, either on the queue or on the ticket itself, will be automatically assigned tickets.</p>
+<p><&|/l&>This filter selects eligible owners by their role membership. Only members of the following role, either on the queue or on the ticket itself, will be automatically assigned tickets.</&></p>
<div class="form-row">
<div class="col-3 label">
diff --git a/html/Admin/Queues/Elements/Filter/UserDefined b/html/Admin/Queues/Elements/Filter/UserDefined
index 48c2e8a..4657d03 100644
--- a/html/Admin/Queues/Elements/Filter/UserDefined
+++ b/html/Admin/Queues/Elements/Filter/UserDefined
@@ -1,5 +1,5 @@
<&| /Admin/Queues/Elements/SortableBox, prefix => $prefix, is_filter => 1, class_name => 'UserDefined', &>
-<p>This filter selects eligible owners based on the provided Perl code. The code is evaluated for each <tt>$User</tt>. The code should return 1 to include that user, or 0 to exclude. The variable <tt>@Users</tt> contains the list of all potential owners and <tt>$Ticket</tt> is the ticket which is being assigned.</p>
+<p><&|/l&>This filter selects eligible owners based on the provided Perl code. The code is evaluated for each <tt>$User</tt>. The code should return 1 to include that user, or 0 to exclude. The variable <tt>@Users</tt> contains the list of all potential owners and <tt>$Ticket</tt> is the ticket which is being assigned.</&></p>
<textarea cols=80 rows=7 id="<% $prefix %>_code" name="<% $prefix %>_code" class="form-control"><% $config->{code} %></textarea>
</&>
<%ARGS>
diff --git a/html/Admin/Queues/Elements/Filter/WorkSchedule b/html/Admin/Queues/Elements/Filter/WorkSchedule
index 06efaca..3083ac7 100644
--- a/html/Admin/Queues/Elements/Filter/WorkSchedule
+++ b/html/Admin/Queues/Elements/Filter/WorkSchedule
@@ -1,5 +1,5 @@
<&| /Admin/Queues/Elements/SortableBox, prefix => $prefix, is_filter => 1, class_name => 'WorkSchedule' &>
-<p>This filter selects eligible owners by their work schedule. The following user custom field decides which work schedule each user maintains. Administrators may update the <tt>%ServiceBusinessHours</tt> RT config for adding or modifying the available schedules.</p>
+<p><&|/l&>This filter selects eligible owners by their work schedule. The following user custom field decides which work schedule each user maintains. Administrators may update the <tt>%ServiceBusinessHours</tt> RT config for adding or modifying the available schedules.</&></p>
% if ($user_cfs->Count) {
<div class="form-row">
@@ -16,7 +16,7 @@
</div>
</div>
% } else {
-<p>No user custom fields found.</p>
+<p><&|/l&>No user custom fields found.</&></p>
% }
</&>
<%INIT>
commit 15277965aabb45fc3f9d33e098714895136c391b
Author: sunnavy <sunnavy at bestpractical.com>
Date: Wed Jul 29 03:56:43 2020 +0800
Support RT 5.0 and update docs accordingly
diff --git a/META.yml b/META.yml
index d3a4095..66f2881 100644
--- a/META.yml
+++ b/META.yml
@@ -23,10 +23,10 @@ no_index:
- t
requires:
Business::Hours: 0
- perl: 5.8.3
+ perl: 5.10.1
resources:
license: http://opensource.org/licenses/gpl-license.php
version: '0.04'
x_module_install_rtx_version: '0.42'
-x_requires_rt: '4.2'
-x_rt_too_new: '4.6'
+x_requires_rt: '5.0'
+x_rt_too_new: '5.2'
diff --git a/Makefile.PL b/Makefile.PL
index 7f4e902..6e1e427 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -5,8 +5,8 @@ RTx 'RT-Extension-AutomaticAssignment';
requires 'Business::Hours';
-requires_rt '4.2';
-rt_too_new '4.6';
+requires_rt '5.0';
+rt_too_new '5.2';
my ($lib_path) = $INC{'RT.pm'} =~ /^(.*)[\\\/]/;
my $local_lib_path = "$RT::LocalPath/lib";
diff --git a/README b/README
index a74d0ef..764520d 100644
--- a/README
+++ b/README
@@ -19,7 +19,7 @@ INSTALLATION
If you are upgrading this module, check for upgrading instructions
in case changes need to be made to your database.
- Edit your /opt/rt4/etc/RT_SiteConfig.pm
+ Edit your /opt/rt5/etc/RT_SiteConfig.pm
Add this line:
Plugin( "RT::Extension::AutomaticAssignment" );
@@ -31,7 +31,7 @@ INSTALLATION
Set( @CustomFieldValuesSources, "RT::CustomFieldValues::ServiceBusinessHours" );
Clear your mason cache
- rm -rf /opt/rt4/var/mason_data/obj
+ rm -rf /opt/rt5/var/mason_data/obj
Restart your webserver
Create scrips
diff --git a/lib/RT/Extension/AutomaticAssignment.pm b/lib/RT/Extension/AutomaticAssignment.pm
index 9521974..7f47998 100644
--- a/lib/RT/Extension/AutomaticAssignment.pm
+++ b/lib/RT/Extension/AutomaticAssignment.pm
@@ -241,7 +241,7 @@ in your database.
If you are upgrading this module, check for upgrading instructions
in case changes need to be made to your database.
-=item Edit your /opt/rt4/etc/RT_SiteConfig.pm
+=item Edit your /opt/rt5/etc/RT_SiteConfig.pm
Add this line:
@@ -254,7 +254,7 @@ filter, which exposes the RT's SLA business hours as custom field values:
=item Clear your mason cache
- rm -rf /opt/rt4/var/mason_data/obj
+ rm -rf /opt/rt5/var/mason_data/obj
=item Restart your webserver
diff --git a/lib/RT/Extension/AutomaticAssignment/Test.pm.in b/lib/RT/Extension/AutomaticAssignment/Test.pm.in
index 365e4a8..11af872 100644
--- a/lib/RT/Extension/AutomaticAssignment/Test.pm.in
+++ b/lib/RT/Extension/AutomaticAssignment/Test.pm.in
@@ -2,7 +2,7 @@ use strict;
use warnings;
### after: use lib qw(@RT_LIB_PATH@);
-use lib qw(/opt/rt4/local/lib /opt/rt4/lib);
+use lib qw(/opt/rt5/local/lib /opt/rt5/lib);
package RT::Extension::AutomaticAssignment::Test;
commit 13707b1f79900a7abe0d2bc1274177ad330081c5
Author: sunnavy <sunnavy at bestpractical.com>
Date: Wed Jul 29 04:43:32 2020 +0800
Prep 1.00
diff --git a/Changes b/Changes
index 465fcd1..5f021fa 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+1.00 2020-07-28
+ - Add RT 5 Support(RT 4 users need to use 0.* versions)
+
0.04 2020-07-27
- Add user-defined choosers and filters
diff --git a/META.yml b/META.yml
index 66f2881..a158456 100644
--- a/META.yml
+++ b/META.yml
@@ -26,7 +26,7 @@ requires:
perl: 5.10.1
resources:
license: http://opensource.org/licenses/gpl-license.php
-version: '0.04'
+version: '1.00'
x_module_install_rtx_version: '0.42'
x_requires_rt: '5.0'
x_rt_too_new: '5.2'
diff --git a/README b/README
index 764520d..70105d3 100644
--- a/README
+++ b/README
@@ -3,7 +3,8 @@ NAME
rules
INSTALLATION
- RT-Extension-AutomaticAssignment requires version RT 4.2.0 or later.
+ RT-Extension-AutomaticAssignment 1.* versions require RT 5.0 or later.
+ Use 0.* versions if you are still using RT 4.
perl Makefile.PL
make
diff --git a/lib/RT/Extension/AutomaticAssignment.pm b/lib/RT/Extension/AutomaticAssignment.pm
index 7f47998..e10fd74 100644
--- a/lib/RT/Extension/AutomaticAssignment.pm
+++ b/lib/RT/Extension/AutomaticAssignment.pm
@@ -2,7 +2,7 @@ package RT::Extension::AutomaticAssignment;
use strict;
use warnings;
-our $VERSION = '0.04';
+our $VERSION = '1.00';
RT->AddStyleSheets("automatic-assignment.css");
RT->AddJavaScript("automatic-assignment.js");
@@ -219,7 +219,8 @@ RT-Extension-AutomaticAssignment - automatically assign tickets based on rules
=head1 INSTALLATION
-RT-Extension-AutomaticAssignment requires version RT 5.0 or later.
+RT-Extension-AutomaticAssignment 1.* versions require RT 5.0 or later.
+Use 0.* versions if you are still using RT 4.
=over
-----------------------------------------------------------------------
More information about the Bps-public-commit
mailing list