[Rt-commit] rt branch, 4.4/search-builder-ajax-format-changes, created. rt-4.2.11-219-gbf7e8a3

? sunnavy sunnavy at bestpractical.com
Fri Oct 2 15:59:44 EDT 2015


The branch, 4.4/search-builder-ajax-format-changes has been created
        at  bf7e8a368a83fb47b134b17c06fadaa3888b24ab (commit)

- Log -----------------------------------------------------------------
commit 73b58c996091ba906a09921d638acc956b7e1aea
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Oct 1 20:56:28 2015 +0800

    ajaxify format updates in ticket search

diff --git a/share/html/Helpers/BuildFormatString b/share/html/Helpers/BuildFormatString
new file mode 100644
index 0000000..6d2d82e
--- /dev/null
+++ b/share/html/Helpers/BuildFormatString
@@ -0,0 +1,69 @@
+%# BEGIN BPS TAGGED BLOCK {{{
+%#
+%# COPYRIGHT:
+%#
+%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
+%#                                          <sales at 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
+%# you are the copyright holder for those contributions and you grant
+%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+%# 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 }}}
+<%init>
+my ( $Format, $AvailableColumns, $CurrentFormat ) = $m->comp(
+    '/Search/Elements/BuildFormatString',
+    %ARGS
+);
+$r->content_type('application/json; charset=utf-8');
+
+my $CurrentDisplayColumns = '';
+my $i=0;
+my $current = $ARGS{CurrentDisplayColumns} || ''; $current =~ s/^\d+>//;
+for my $field ( @$CurrentFormat ) {
+    $CurrentDisplayColumns .= qq!<option value="$i>$field->{Column}" ! . ( $field->{Column} eq $current ? 'selected="selected"' : '' ) . '>' .  ( $field->{Column} =~ /^(?:CustomField|CF)\./ ? $field->{Column} : loc( $field->{Column} ) ) . '</option>';
+    $i++;
+}
+
+$m->out( JSON({
+    status => 'success',
+    Format => $Format,
+    CurrentDisplayColumns => $CurrentDisplayColumns,
+}) );
+$m->abort;
+</%init>
diff --git a/share/html/Search/Elements/EditFormat b/share/html/Search/Elements/EditFormat
index bc930d7..cf11631 100644
--- a/share/html/Search/Elements/EditFormat
+++ b/share/html/Search/Elements/EditFormat
@@ -57,6 +57,28 @@
 <script type="text/javascript">
 jQuery( function() {
     jQuery('select[name=SelectDisplayColumns].chosen').chosen({ width: '12em', placeholder_text_multiple: ' ', no_results_text: ' ', search_contains: true });
+    jQuery('[name=AddCol], [name=RemoveCol], [name=ColUp], [name=ColDown]').click( function() {
+        var name = jQuery(this).attr('name');
+        var form = jQuery(this).closest('form');
+        jQuery.ajax({
+            url: '/Helpers/BuildFormatString?' + name + '=1&' + form.serialize(),
+            success: function (data) {
+                if ( data.status == 'success' ) {
+                    form.find('input[name=Format]').val(data.Format);
+                    form.find('select[name=CurrentDisplayColumns]').html(data.CurrentDisplayColumns);
+                    form.find('select[name=SelectDisplayColumns]').val('').trigger("chosen:updated");
+                    form.find('[name=Link],[name=Title],[name=Size],[name=Face]').val('');
+                }
+                else {
+                    alert('<% loc("Failed to update format. Reason:") %>' + ' ' + data.message);
+                }
+            },
+            error: function (xhr, reason) {
+                alert('<% loc("Failed to update format. Reason:") %>' + ' ' + reason);
+            }
+        });
+        return false;
+    });
 });
 </script>
 <tr>

commit bf7e8a368a83fb47b134b17c06fadaa3888b24ab
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Sat Oct 3 03:57:54 2015 +0800

    enlarge "Show Columns" box size, 4 was too small

diff --git a/share/html/Search/Elements/EditFormat b/share/html/Search/Elements/EditFormat
index cf11631..3863f39 100644
--- a/share/html/Search/Elements/EditFormat
+++ b/share/html/Search/Elements/EditFormat
@@ -131,7 +131,7 @@ jQuery( function() {
 <td><input type="submit" class="button" name="AddCol" value=" → " /></td>
 
 <td valign="top">
-<select size="4" name="CurrentDisplayColumns">
+<select size="8" name="CurrentDisplayColumns">
 % my $i=0;
 % my $current = $ARGS{CurrentDisplayColumns} || ''; $current =~ s/^\d+>//;
 % foreach my $field ( @$CurrentFormat ) {

-----------------------------------------------------------------------


More information about the rt-commit mailing list