← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17708: minor fix in dhisAjaxSelect plugin, use '' for filter string, this is needed to allow for authori...

 

------------------------------------------------------------
revno: 17708
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-12-16 12:22:11 +0100
message:
  minor fix in dhisAjaxSelect plugin, use '' for filter string, this is needed to allow for authorities with spaces
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.dhisAjaxSelect.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.dhisAjaxSelect.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.dhisAjaxSelect.js	2014-03-02 06:01:54 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.dhisAjaxSelect.js	2014-12-16 11:22:11 +0000
@@ -198,7 +198,7 @@
                         $connectedTo.children().each(function()
                         {
                             var value = $(this).attr("value");
-                            $select.find("option[value=" + value + "]").remove();
+                            $select.find("option[value='" + value + "']").remove();
                         });
                     }
                 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm	2014-10-10 08:19:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm	2014-12-16 11:22:11 +0000
@@ -21,7 +21,7 @@
 			handler: function(item) {
 				var option = jQuery("<option />");
 				option.text( item.name );
-				option.attr( "value", item.id );
+        option.attr( "value", item.id );
 
 				return option;
 			}
@@ -104,7 +104,7 @@
         	<td>
           		<select id="selectedListAuthority" name="selectedListAuthority" multiple="multiple" style="height: 200px; width: 100%; margin-top: 22px;">
             	#foreach ( $selectedAuthority in $roleAuthorities )
-					<option value="$selectedAuthority">$i18n.getString( $selectedAuthority )</option>
+								<option value="$selectedAuthority">$i18n.getString( $selectedAuthority )</option>
             	#end
           		</select>
         	</td>