# HG changeset patch
# User luisf
# Date 1296746139 0
# Node ID 0d3dd7562e6a614191b8979b9efea66f0c76b1e6
# Parent  5b074cadc4d160e960e8d58e6b7e2bf3400c1130
orders the institution select dropdown by the db's order field

diff -r 5b074cadc4d1 -r 0d3dd7562e6a app/views/account/register.rhtml
--- a/app/views/account/register.rhtml	Thu Feb 03 14:42:31 2011 +0000
+++ b/app/views/account/register.rhtml	Thu Feb 03 15:15:39 2011 +0000
@@ -43,7 +43,7 @@
 
                         <p><label for="institution"><%=l("field_ssamr_user_detail.institution")%> <span class="required">*</span></label>
 							<%= ssamr_user_detail.radio_button :institution_type, true %>
-                          	<%= ssamr_user_detail.collection_select(:institution_id, Institution.all, :id, :name, {:prompt => true}).gsub('&amp;', '&')  %>
+                          	<%= ssamr_user_detail.collection_select(:institution_id, Institution.find(:all, :order => "institutions.order"), :id, :name, {:prompt => true}).gsub('&amp;', '&')  %>
 						</p>
 
                         <p>
diff -r 5b074cadc4d1 -r 0d3dd7562e6a app/views/my/account.rhtml
--- a/app/views/my/account.rhtml	Thu Feb 03 14:42:31 2011 +0000
+++ b/app/views/my/account.rhtml	Thu Feb 03 15:15:39 2011 +0000
@@ -43,7 +43,7 @@
             <p><label for="institution"><%=l("field_ssamr_user_detail.institution")%> <span class="required">*</span></label>
 			<nobr>
               <%= ssamr_user_detail.radio_button :institution_type, true %>
-              <%= ssamr_user_detail.collection_select(:institution_id, Institution.all, :id, :name, {:selected => @selected_institution_id, :prompt => true} ).gsub('&amp;', '&') %>
+              <%= ssamr_user_detail.collection_select(:institution_id, Institution.find(:all, :order => "institutions.order"), :id, :name, {:selected => @selected_institution_id, :prompt => true} ).gsub('&amp;', '&') %>
             </nobr>
 			</p>
 
diff -r 5b074cadc4d1 -r 0d3dd7562e6a app/views/users/_form.rhtml
--- a/app/views/users/_form.rhtml	Thu Feb 03 14:42:31 2011 +0000
+++ b/app/views/users/_form.rhtml	Thu Feb 03 15:15:39 2011 +0000
@@ -33,7 +33,7 @@
             <p><label for="institution"><%=l("field_ssamr_user_detail.institution")%> <span class="required">*</span></label>
 			 <nobr>
               <%= ssamr_user_detail.radio_button :institution_type, true %>
-              <%= ssamr_user_detail.collection_select(:institution_id, Institution.all, :id, :name, {:selected => @selected_institution_id, :prompt => true} ).gsub('&amp;', '&')  %>
+              <%= ssamr_user_detail.collection_select(:institution_id, Institution.find(:all, :order => "institutions.order"), :id, :name, {:selected => @selected_institution_id, :prompt => true} ).gsub('&amp;', '&')  %>
              </nobr>
 			</p>