Mercurial > hg > soundsoftware-site

changeset 183:0d3dd7562e6a feature_55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
orders the institution select dropdown by the db's order field
author luisf
date Thu, 03 Feb 2011 15:15:39 +0000
parents 5b074cadc4d1
children b46db3a8b1b4 594ed6aef7bd
files app/views/account/register.rhtml app/views/my/account.rhtml app/views/users/_form.rhtml
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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>
--- 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>
 
--- 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>