|
|
|
@ -61,13 +61,23 @@
|
|
|
|
|
<% end %>
|
|
|
|
|
|
|
|
|
|
<!-- added by bai 单位-->
|
|
|
|
|
<% unless @user.user_extensions.nil?%>
|
|
|
|
|
<p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%> <%= text_field_tag "occupation", @user.user_extensions.occupation, :class => 'occupation'%>
|
|
|
|
|
<!--<% unless @user.user_extensions.nil?%>
|
|
|
|
|
<p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%> <span class="required">*</span><%= text_field_tag "occupation", @user.user_extensions.occupation, :class => 'occupation' %>
|
|
|
|
|
</p>
|
|
|
|
|
<%else%>
|
|
|
|
|
<p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%><%= text_field_tag "occupation", nil, :class => 'occupation'%>
|
|
|
|
|
<p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%><span class="required">*</span><%= text_field_tag "occupation", nil, :class => 'occupation' %>
|
|
|
|
|
</p>
|
|
|
|
|
<%end%>
|
|
|
|
|
-->
|
|
|
|
|
|
|
|
|
|
<!-- added by Wen -->
|
|
|
|
|
<p style="width:357px;padding-left: 26px;">
|
|
|
|
|
<%= l(:field_occupation) %> <select name='province'><%= options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province) %></select>
|
|
|
|
|
|
|
|
|
|
<%= select_tag 'occupation', options_from_collection_for_select(School.all, :name, :name) %>
|
|
|
|
|
</p>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!-- added by bai 增加了地区 -->
|
|
|
|
|
|
|
|
|
|