[Rt-commit] rt branch, 5.0/allow-asset-autocomplete, created. rt-5.0.0-137-gf38cafae73

[Craig Kaiser]

The branch, 5.0/allow-asset-autocomplete has been created
        at  f38cafae73dd4d4cc074b8b90e66e96a670acfb9 (commit)

- Log -----------------------------------------------------------------
commit 02f188f371fdc2eae43f3093fdabe8f53cf9293f
Author: craig kaiser <craig at bestpractical.com>
Date:   Mon Dec 7 15:33:35 2020 -0500

    Add autocomplete for assets input

diff --git a/share/html/Helpers/Autocomplete/Assets b/share/html/Helpers/Autocomplete/Assets
new file mode 100644
index 0000000000..c7abdddfed
--- /dev/null
+++ b/share/html/Helpers/Autocomplete/Assets
@@ -0,0 +1,43 @@
+% $r->content_type('application/json; charset=utf-8');
+<% JSON( \@suggestions ) |n %>
+% $m->abort;
+
+<%ARGS>
+$term       => undef
+$max        => 10
+$op         => 'STARTSWITH'
+$right      => undef
+$return     => 'id'
+$queue      => undef
+</%ARGS>
+
+<%INIT>
+# Only allow certain return fields
+$return = 'Name'
+    unless $return =~ /^(?:id|Name)$/;
+
+$m->abort unless defined $return
+             and defined $term
+             and length $term;
+
+# Sanity check the operator
+$op = 'STARTSWITH' unless $op =~ /^(?:LIKE|(?:START|END)SWITH|=|!=)$/i;
+
+my $assets = RT::Assets->new( $session{CurrentUser} );
+
+$assets->RowsPerPage( $max );
+$assets->Limit(
+    FIELD           => 'Name',
+    OPERATOR        => $op,
+    VALUE           => $term,
+    ENTRYAGGREGATOR => 'OR',
+    CASESENSITIVE   => 0,
+);
+
+my @suggestions;
+while (my $a = $assets->Next) {
+    next if $right and not $a->CurrentUserHasRight($right);
+    my $value = $a->$return;
+    push @suggestions, { label => $a->Name, value => $value };
+}
+</%INIT>
diff --git a/share/html/Ticket/Elements/ShowAssets b/share/html/Ticket/Elements/ShowAssets
index bebb094ec0..441ccd257e 100644
--- a/share/html/Ticket/Elements/ShowAssets
+++ b/share/html/Ticket/Elements/ShowAssets
@@ -213,7 +213,7 @@ if ($ShowRelatedTickets) {
     <label><&|/l&>Add an asset to this ticket:</&></label>
     <div class="form-row">
       <div class="form-group mx-sm-3 mb-2">
-        <input class="form-control mb-2" size="10" name="<% $Ticket->id %>-RefersTo" placeholder="<&|/l&>Asset #</&>" type="text">
+        <input data-autocomplete="Assets" class="form-control mb-2" size="10" name="<% $Ticket->id %>-RefersTo" placeholder="<&|/l&>Asset #</&>" type="text">
       </div>
       <button type="submit" name="AddAsset" value="Add" class="button btn btn-primary form-control mb-2">Add</button>
     </div>
diff --git a/share/static/js/autocomplete.js b/share/static/js/autocomplete.js
index c56ea33218..7413c4bf81 100644
--- a/share/static/js/autocomplete.js
+++ b/share/static/js/autocomplete.js
@@ -7,7 +7,8 @@ window.RT.Autocomplete.Classes = {
     Groups: 'group',
     Tickets: 'tickets',
     Queues: 'queues',
-    Articles: 'articles'
+    Articles: 'articles',
+    Assets: 'assets'
 };
 
 Selectize.define('rt_drag_drop', function(options) {

commit 456c88fee760955d645c23a8876399c272e5900b
Author: craig kaiser <craig at bestpractical.com>
Date:   Mon Dec 7 15:54:36 2020 -0500

    Remove custom asset form submission processing
    
    Assets can be processed using normal form submission values that do not
    need to be pre-processed by JS.

diff --git a/share/static/js/assets.js b/share/static/js/assets.js
index a70a4dcd62..deac8c06aa 100644
--- a/share/static/js/assets.js
+++ b/share/static/js/assets.js
@@ -10,14 +10,6 @@ jQuery(function() {
         // since the plugin only runs on page load.
         jQuery('.selectpicker').selectpicker('refresh');
     };
-
-    jQuery(".ticket-assets form").submit(function(){
-        var input = jQuery("[name*=RefersTo]", this);
-        if (input.val())
-            input.val(input.val().match(/\S+/g)
-                                 .map(function(x){return "asset:"+x})
-                                 .join(" "));
-    });
     jQuery("#page-actions-create-linked-ticket").click(function(ev){
         ev.preventDefault();
         var url = this.href.replace(/\/Asset\/CreateLinkedTicket\.html\?/g,

commit f38cafae73dd4d4cc074b8b90e66e96a670acfb9
Author: craig kaiser <craig at bestpractical.com>
Date:   Mon Dec 7 15:56:40 2020 -0500

    Allow name to be returned for asset autocomplete

diff --git a/share/html/Helpers/Autocomplete/Assets b/share/html/Helpers/Autocomplete/Assets
index c7abdddfed..7e3f5db8cf 100644
--- a/share/html/Helpers/Autocomplete/Assets
+++ b/share/html/Helpers/Autocomplete/Assets
@@ -7,7 +7,7 @@ $term       => undef
 $max        => 10
 $op         => 'STARTSWITH'
 $right      => undef
-$return     => 'id'
+$return     => 'Name'
 $queue      => undef
 </%ARGS>
 
diff --git a/share/html/Ticket/Elements/ShowAssets b/share/html/Ticket/Elements/ShowAssets
index 441ccd257e..cd62353df6 100644
--- a/share/html/Ticket/Elements/ShowAssets
+++ b/share/html/Ticket/Elements/ShowAssets
@@ -213,7 +213,7 @@ if ($ShowRelatedTickets) {
     <label><&|/l&>Add an asset to this ticket:</&></label>
     <div class="form-row">
       <div class="form-group mx-sm-3 mb-2">
-        <input data-autocomplete="Assets" class="form-control mb-2" size="10" name="<% $Ticket->id %>-RefersTo" placeholder="<&|/l&>Asset #</&>" type="text">
+        <input data-autocomplete="Assets" class="form-control mb-2" size="10" name="<% $Ticket->id %>-RefersTo" placeholder="<&|/l&>Asset # or Name</&>" type="text">
       </div>
       <button type="submit" name="AddAsset" value="Add" class="button btn btn-primary form-control mb-2">Add</button>
     </div>

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