[Bps-public-commit] rt-extension-assets branch, master, updated. 1.01_1-18-g448a6a3

[Alex Vandiver]

The branch, master has been updated
       via  448a6a3626055fa52a853cbc6e717ceec9be44f6 (commit)
       via  a6fb30c166d822872876759c40a2d9a3b3a7164f (commit)
       via  227ab98a89167a99735fb177d45d231dceed829c (commit)
       via  c5a86bb933a9bbc7ca152d3c33ff60c8ec691406 (commit)
      from  01f8e1d5e3207a3b322234f0607ee7bf44daa7fe (commit)

Summary of changes:
 etc/initialdata             | 2 ++
 html/Asset/Search/Bulk.html | 4 ++--
 static/css/RTx-Assets.css   | 7 +++++++
 static/js/RTx-Assets.js     | 4 +++-
 4 files changed, 14 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit c5a86bb933a9bbc7ca152d3c33ff60c8ec691406
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Oct 15 14:01:12 2014 -0400

    Loading initialdata with Assets in plugins still requires loading RT::Asset
    
    This makes tests no longer warn.

diff --git a/etc/initialdata b/etc/initialdata
index a0e69b1..303d6f4 100644
--- a/etc/initialdata
+++ b/etc/initialdata
@@ -10,6 +10,8 @@ unless (grep {$_ eq "RT::Extension::Assets"} RT->Config->Get('Plugins')) {
     require RT::Extension::Assets;
 }
 
+require RT::Asset;
+
 our (@Final);
 
 # Create global role groups

commit 227ab98a89167a99735fb177d45d231dceed829c
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Oct 15 14:02:34 2014 -0400

    Ensure that "add" and "remove" are placed on the same line, even after single roles

diff --git a/html/Asset/Search/Bulk.html b/html/Asset/Search/Bulk.html
index aa67beb..cd26f5e 100644
--- a/html/Asset/Search/Bulk.html
+++ b/html/Asset/Search/Bulk.html
@@ -100,7 +100,7 @@
 % my $role = $asset->Role( $rname );
 % if ( $role->{'Single'} ) {
 % my $input = "SetRoleMember-$rname";
-<tr>
+<tr class="full-width">
 <td class="label"><label for="<% $input %>"><% loc($rname) %></label></td>
 <td><input type="text" value="<% $ARGS{ $input } || '' %>" name="<% $input %>" id="<% $input %>" data-autocomplete="Users" data-autocomplete-return="Name" /></td>
 </tr>
diff --git a/static/css/RTx-Assets.css b/static/css/RTx-Assets.css
index b169afe..3526fa7 100644
--- a/static/css/RTx-Assets.css
+++ b/static/css/RTx-Assets.css
@@ -203,6 +203,13 @@ body#comp-Asset-Search .collection-as-table td {
         padding: inherit;
     }
 
+    .asset-bulk-people tr.full-width,
+    .asset-search-people tr.ful-width,
+    .asset-bulk-basics tr.full-width,
+    .asset-search-basics tr.full-width {
+        width: 100%;
+    }
+
     .asset-bulk-people tr,
     .asset-search-people tr,
     .asset-bulk-basics tr,

commit a6fb30c166d822872876759c40a2d9a3b3a7164f
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Oct 15 14:02:57 2014 -0400

    Localize, using the same locstring as RT does

diff --git a/html/Asset/Search/Bulk.html b/html/Asset/Search/Bulk.html
index cd26f5e..74fe7db 100644
--- a/html/Asset/Search/Bulk.html
+++ b/html/Asset/Search/Bulk.html
@@ -118,7 +118,7 @@
   <input type="text" value="<% $ARGS{ $input } || '' %>" name="<% $input %>" id="<% $input %>" data-autocomplete="Users" data-autocomplete-return="Name" />
   <label>
     <input type="checkbox" name="RemoveAllRoleMembers-<% $rname %>" value="1"/>
-    <em>check box to delete all</em>
+    <em><&|/l&>(Check to delete all values)</&></em>
   </label>
 </td>
 </tr>

commit 448a6a3626055fa52a853cbc6e717ceec9be44f6
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Oct 15 14:03:15 2014 -0400

    Support adding multiple space-separated assets at once

diff --git a/static/js/RTx-Assets.js b/static/js/RTx-Assets.js
index 6d70f8c..853ba86 100644
--- a/static/js/RTx-Assets.js
+++ b/static/js/RTx-Assets.js
@@ -21,7 +21,9 @@ jQuery(function() {
     jQuery(".ticket-assets form").submit(function(){
         var input = jQuery("[name*=RefersTo]", this);
         if (input.val())
-            input.val("asset:" + 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();

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