Fixed: Selecting other requestors resulted in an JS error.

bheisig · Aug 28, 2014 · 75e94eb · 75e94eb
1 parent 9972167
commit 75e94eb
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 21 deletions.
diff --git a/SIGNATURE b/SIGNATURE
@@ -29,16 +29,16 @@ SHA1 a4d2ea1f471afabec0c5fab707c24cf68e217c0f html/Callbacks/ReferenceIdoitObjec
 SHA1 d46b04ea151d165892545d975730d90fd7c0d72c html/Callbacks/ReferenceIdoitObjects/Ticket/Create.html/AfterBasics
 SHA1 0c2bc6a606fa4137512b27bfa340c9d8ff410471 html/Callbacks/ReferenceIdoitObjects/Ticket/Create.html/FormStart
 SHA1 48fa00ecafbb02e55d067d7a1c49a1a765b1f210 html/Callbacks/ReferenceIdoitObjects/Ticket/Elements/ShowSummary/LeftColumn
-SHA1 9e3ec26a138e3ca06c2fba89726e666d0f605172 html/Callbacks/ReferenceIdoitObjects/Ticket/ModifyAll.html/AfterBasics
-SHA1 d4d1963907cad0a0d157c859f529c966c3c11b20 html/Elements/SelectIDoitObjects
+SHA1 c2e3b6feef734e05b2090dd38d54bef3f79f63b4 html/Callbacks/ReferenceIdoitObjects/Ticket/ModifyAll.html/AfterBasics
+SHA1 7391f85dbcb70df3b24c211311204304d0a2591a html/Elements/SelectIDoitObjects
 SHA1 d40e6fe17930b530560decced489b56a64a51473 html/Elements/ShowIDoitObjects
 SHA1 fd32cd86b69b798719934d558aef56a70497a1a2 html/NoAuth/css/chosen.min.css
 SHA1 bfd4e05c16b578b376e3dc08a57786cd64c1ca21 html/NoAuth/css/i-doit_object_browser.css
 SHA1 383e0698bf8ea55a6fdec3456b3a60f89b2308c5 html/NoAuth/css/jquery.dataTables.min.css
 SHA1 9dd6a493d2044e12fcf21addfe0cd93293568d69 html/NoAuth/js/chosen.jquery.min.js
 SHA1 9cab72c6d9fde4def30a426c3ed9c8bc5ccd310a html/NoAuth/js/i-doit_ie_fix.js
 SHA1 9e1e8dc22883cee14e20fa2921696cd330c7d7be html/NoAuth/js/jquery.dataTables.min.js
-SHA1 4846b771c1ff109074d5998a1a0b815c329b0d6e html/NoAuth/js/referenceidoitobjects.js
+SHA1 654c0ea0bf1c4ed05ab2ee1ed3aa0d2b86c589ca html/NoAuth/js/referenceidoitobjects.js
 SHA1 33144b4a8c148e18c8d181f47d0342e63b60536c html/Ticket/Elements/EditIDoitObjects
 SHA1 bb92b11d622f7584fa270175cd1829be97f96e3d html/Ticket/Elements/ShowIDoitObjects
 SHA1 044e283cd89e78d5a778cdbcbfebca8570c2cfa0 html/Ticket/ModifyIDoitObjects.html
@@ -104,17 +104,17 @@ SHA1 640935336dc1123c0069bcf5432bcaedc2cf22d3 t/pod.t
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
-iQIcBAEBAgAGBQJT/c6UAAoJEBPBqo0HF/6l+vcP/AlvZJ23zHuU0yzOuOcFtAol
-b3OWhB85+UcWHnN2S17lgTQ8mIl1VLqqZQGqcZPKaTHr4w2MM1BRINWUBjmOQYzw
-ulyWVYv1TY+hzcLmJSNcCrT3j17PGQKhymw7aNeU61Sn9KYf0QakTQ9lWmZKRW/4
-OsSLnElYmQa1UPEaHljAAbtlylrcGX0Wj5vyHqpwpvDnjUD1C4gHN1GG5UPyybYT
-DicEfTaUQzG4drre+eQbTV7U97Xbp5ukhYqoulg7v8VPNYBq8QdM3hPw3847klZG
-1owvCBK7UWmS50+Q6Bih8aPX094KLyWhs7Tew4JTdA+55Tx5BdSWPr00TesLsP4v
-xa8njtoVhvhak3IBezAfBoGaYIEIQlH+yfouoIKtC/utSOgliwTaRGhmPj1UejOp
-yq7UjZ8sK9BzJTrqq5PKuE6+mrgXRsEhPigAiXgzhqBgFiLMaeCN0l+7HKdVx7sJ
-xH5zyBcwIUcMSCSJXQMnHCaQ9+UhUl58b/3MCDfnyEVQfZdB9wlI18aRe86uHu5q
-dHoJHM9n3lCH/jfedkgE9oRm9TrUbHI/NjJ+i+5xWyoz6e97T446SpSGIB9p7sN2
-8GnbQQEsNLG1VZDZMHqc4qM+x1zBnu53oBd7zLOBwbe5wZ9IfhkSMKqTlXF2QfxN
-D7c78iXNNTEpLipR1pfu
-=u7s4
+iQIcBAEBAgAGBQJT/0txAAoJEBPBqo0HF/6l/b0P/0eeX3j3QSKucxNbTzl/G91M
+PbhGojlbg5SXgW157wzAGDhbYdGTe3JBZ51S/O0fQA751FBW1exqd0FFQcwysoWE
+STRW3cYHEeEIBiYxmIU2hMg0fHhhc4pRs5LdMnAys2kxgDte31llULJBYq7fcvAF
+nDx00a1VyA3SFpFNHmZEZKN9sGVCyrnxw9LfAjtYF9S3ZlliupJHTtrBwTJZnoNh
+ISwf6j1ALg3Pjurt7GXn1bdTwoI4nl/JLNTKjg7zJYQv9LwYn9THM9kTm4bmqVBs
+eXfNhz8g+HEsfiJz+zJsva7eFwYR32bPN8vZHDfm8dZeaF+d4SndRAS1zdGpdFW+
+Q33ZhpvXZ7wTG1pcSo3AP+Tm+PVcabWXcQZL6x922Zp1koQ134UpEjSITyc6yGpy
+/sT8P6G3YHFm3JJDZtJpEdnygDDMUUXs7izauqSMfUJNIhefOtsHtYCrn/13pOP5
+yL+/OgWOsJCWa+O6yh00ewyr80JXE2wGE0Cyi98QF69FOef6RuWzbnkSy0otynMb
+MAeSp672pS46LV3yQJnJZv5SOgAvAAWIhycpYe1SdFBXCbhj6pifEo4QUT4fV1i+
+g0RDuhQ+Ntgpdj8fmXQnb2p9K/raKFkh25TaR1iQ+r5swkzXPj9oym3iC9Rwx9Uu
+jv2EpsFsnn9yzo1dMXLn
+=ldYW
 -----END PGP SIGNATURE-----
diff --git a/html/Callbacks/ReferenceIdoitObjects/Ticket/ModifyAll.html/AfterBasics b/html/Callbacks/ReferenceIdoitObjects/Ticket/ModifyAll.html/AfterBasics
@@ -18,6 +18,7 @@
 %# Request Tracker (RT) is Copyright Best Practical Solutions, LLC.
 
 <&| /Widgets/TitleBox, title => loc('Referenced i-doit objects'), class=> 'ticket-info-basic' &>
+    <input type="hidden" id="Requestors" name="Requestory" value="<% $Ticket->RequestorAddresses %>" />
     <& /Ticket/Elements/EditIDoitObjects, TicketObj => $Ticket &>
 </&>
 

diff --git a/html/Elements/SelectIDoitObjects b/html/Elements/SelectIDoitObjects
@@ -55,7 +55,7 @@
 
         <div id="idoitWorkplacesTab">
             <div class="workplaces"></div>
-            <a href="#" id="idoitCustomerReload"><% loc('Refresh') %></a>
+            <a href="javascript:void(null);" id="idoitCustomerReload"><% loc('Refresh') %></a>
         </div>
 
         <div id="idoitDevicesTab">

diff --git a/html/NoAuth/js/referenceidoitobjects.js b/html/NoAuth/js/referenceidoitobjects.js
@@ -326,15 +326,22 @@ ReferenceIDoitObjects = function (params) {
      */
     this.loadCustomerData = function () {
         var customers = [],
-            customerList = that.customers.val();
+            customerList = that.customers.val(),
+            workplacesInfo = $('#idoitWorkplacesTab div'),
+            devicesInfo = $('#idoitDevicesInfo'),
+            devicesTableWrapper = $('#idoitDevicesTable_wrapper');
 
         if (typeof customerList !== 'string' || customerList.length === 0) {
-            $('#idoitWorkplacesTab div').html(params.l10n['There is no customer selected.']);
+            workplacesInfo.html(params.l10n['There is no customer selected.']);
             $('#idoitDevicesInfo').html(params.l10n['There is no customer selected.']);
-            that.devicesTable.hide();
+            devicesTableWrapper.hide();
             that.installedSoftware.hide();
             return;
-        }
+        } //if
+
+        workplacesInfo.html('');
+        devicesInfo.html('');
+        devicesTableWrapper.show();
 
         customers = customerList.replace(/(\s)/g, '').split(',');