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

[Alex Vandiver]

The branch, master has been updated
       via  01f8e1d5e3207a3b322234f0607ee7bf44daa7fe (commit)
       via  90d555c0e2a81dfe75decfade8002f6e16d200eb (commit)
       via  37d0400b8d4af7de6b2527e5e8c38e33f5905883 (commit)
       via  fc8b52ad0fd4dabb5bdc1687e9ace31f9daefc2e (commit)
       via  5e4bf090fba4c13b0571174cbe46dc9e57dfd327 (commit)
       via  aa97a5d7c5e353698b21561dce2f414b56df02a0 (commit)
      from  00506df01ca427c4029710d4916d62f0b7bfd641 (commit)

Summary of changes:
 html/Asset/Search/Bulk.html    | 12 ++++++++---
 html/Elements/Assets/AddPeople |  8 ++++----
 lib/RT/Extension/Assets.pm     | 45 ++++++++++++++++++++++++++++++++----------
 3 files changed, 48 insertions(+), 17 deletions(-)

- Log -----------------------------------------------------------------
commit 01f8e1d5e3207a3b322234f0607ee7bf44daa7fe
Merge: 00506df 90d555c
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Oct 15 13:02:04 2014 -0400

    Merge branch 'bulk-update'
    
    Conflicts:
    	html/Elements/Assets/AddPeople

diff --cc html/Elements/Assets/AddPeople
index 1bfad08,b652c57..e73ec5e
--- a/html/Elements/Assets/AddPeople
+++ b/html/Elements/Assets/AddPeople
@@@ -49,18 -2,18 +49,18 @@@
  $Object
  </%args>
  <div class="add-user">
 -<h3>Add a person</h3>
 +<h3><&|/l&>Add a person</&></h3>
- <& SelectRoleType, Object => $Object, Name => "AddRoleMember-User-Type" &>
- <input type="text" name="AddRoleMember-User"
+ <& SelectRoleType, Object => $Object, Name => "AddUserRoleMember-Role" &>
+ <input type="text" name="AddUserRoleMember"
         data-autocomplete="Users"
         data-autocomplete-return="Name"
         placeholder="<% loc("Find a user...") %>">
  </div>
  
  <div class="add-group">
 -<h3>Add a group</h3>
 +<h3><&|/l&>Add a group</&></h3>
- <& SelectRoleType, Object => $Object, Name => "AddRoleMember-Group-Type" &>
- <input type="text" name="AddRoleMember-Group"
+ <& SelectRoleType, Object => $Object, Name => "AddGroupRoleMember-Role" &>
+ <input type="text" name="AddGroupRoleMember"
         data-autocomplete="Groups"
         data-autocomplete-return="Name"
         placeholder="<% loc("Find a group...") %>">

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