jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改测试版个人修改学校、学校列表跨域访问的问题

This commit is contained in:
sw 2014-10-24 14:22:35 +08:00
parent a451385d13
commit 782098c6e7
4 changed files with 60 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/helpers/application_helper.rb
View File

@ -1836,11 +1836,8 @@ module ApplicationHelper
bids_link = link_to l(:label_requirement_enterprise), {:controller => 'bids', :action => 'index'} bids_link = link_to l(:label_requirement_enterprise), {:controller => 'bids', :action => 'index'}
forum_link = link_to l(:label_project_module_forums), {:controller => "forums", :action => "index"} forum_link = link_to l(:label_project_module_forums), {:controller => "forums", :action => "index"}
stores_link = link_to l(:label_stores_index), {:controller => 'stores', :action=> 'index'} stores_link = link_to l(:label_stores_index), {:controller => 'stores', :action=> 'index'}
school_all_school_link = link_to l(:label_school_all), {:controller => 'school', :action => 'index'} school_all_school_link = link_to l(:label_school_all), {:controller => 'school', :action => 'index'}
#@nav_dispaly_project_label #@nav_dispaly_project_label
nav_list = Array.new nav_list = Array.new
nav_list.push(school_all_school_link) if @nav_dispaly_course_all_label && @show_course == 1 nav_list.push(school_all_school_link) if @nav_dispaly_course_all_label && @show_course == 1

2
app/views/my/account.html.erb
View File

@ -16,7 +16,7 @@
function get_options(value) { function get_options(value) {
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: 'http://<%= Setting.host_name%>/school/get_options/' + encodeURIComponent(value), url: 'http://<%= Setting.host_user%>/school/get_options/' + encodeURIComponent(value),
data: 'text', data: 'text',
success: function (data) { success: function (data) {
$("#province").val(value); $("#province").val(value);

129
app/views/school/index.html.erb
View File

@ -1,73 +1,58 @@
<% port = ":3000" if Rails.env.development? %> <% port = ":3000" if Rails.env.development? %>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$("#province").html("<option value='0' selected = true style='display: none;'></option>"); $("#province").html("<option value='0' selected = true style='display: none;'></option>");
$.ajax({ $.ajax({
type :"POST", type :"POST",
url :'http://<%= Setting.host_name %>/school/get_province', url :'http://<%= Setting.host_course %>/school/get_province',
data: "send", data: "send",
success: function(data, textStatus){ success: function(data, textStatus){
$("#province").append(data.text);
$("#province").append(data.text); $("#schoollist").html(data.text_s);
$("#schoollist").html(data.text_s); }
} })
}) });
});
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
function get_school(value){ function get_school(value){
$.ajax({ $.ajax({
type :"POST", type :"POST",
url :'http://<%= Setting.host_name %>/school/get_schoollist/'+encodeURIComponent(value), url :'http://<%= Setting.host_course %>/school/get_schoollist/'+encodeURIComponent(value),
data :'text', data :'text',
success: function(data){ success: function(data){
$("#schoollist").html(data); $("#schoollist").html(data);
}
//$("#schoollist").html(data); })
}
}
}
)
}
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
function test(id){ function test(id){
location.href = encodeURI('http://<%= Setting.host_name %>/?school_id='+id); location.href = encodeURI('http://<%= Setting.host_course %>/?school_id='+id);
} }
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
function ssearch(){ function ssearch(){
//alert($("#key_word").val()); //alert($("#key_word").val());
var value = $("#key_word").val(); var value = $("#key_word").val();
var province = $("#province").val(); var province = $("#province").val();
//alert(value); //alert(value);
if(value == "") if(value == "")
{ {
alert("<%= l(:label_search_conditions_not_null) %>"); alert("<%= l(:label_search_conditions_not_null) %>");
return; return;
} }
//alert(province); $.ajax({
$.ajax({ type :"POST",
type :"POST", url :'http://<%= Setting.host_course %>/school/search_school/?key_word='+encodeURIComponent(value)+'&province='+province,
url :'http://<%= Setting.host_name %>/school/search_school/?key_word='+encodeURIComponent(value)+'&province='+province, data :'text',
data :'text', success: function(data){
success: function(data){ $("#schoollist").html(data);
$("#schoollist").html(data); }
})
//$("#schoollist").html(data); }
}
})
}
function word_keydown(e){ function word_keydown(e){
if(e&& e.keyCode==13){ if(e&& e.keyCode==13){
ssearch(); ssearch();
@ -76,26 +61,28 @@
</script> </script>
<div> <div>
<p> <p>
<%= link_to l(:label_all_schol),school_index_path %>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<%= link_to l(:label_all_schol),school_index_path %>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <% if User.current.logged? %>
<% if User.current.logged? %> <a href="http://<%= Setting.host_course %>">
<a href="http://<%= Setting.host_name %>"><%= l(:label_my_school) %></a> <%= l(:label_my_school) %>
<% end %> </a>
</p> <% end %>
<ul> </p>
<li style="width: 40%; float: left"><%= l(:label_select_province) %>: <ul>
<select id="province" name="province" onchange="get_school(this.value)"></select> <li style="width: 40%; float: left">
</li> <%= l(:label_select_province) %>:
<li style="width: 50%; float: left"><input type="text" id="key_word" name="key_word" onkeydown="word_keydown(event);"/> <select id="province" name="province" onchange="get_school(this.value)"></select>
<input type="button" class="enterprise" value="<%= l(:label_search) %>" onclick="ssearch()"></li> </li>
</ul> <li style="width: 50%; float: left">
<input type="text" id="key_word" name="key_word" onkeydown="word_keydown(event);"/>
<input type="button" class="enterprise" value="<%= l(:label_search) %>" onclick="ssearch()">
</li>
</ul>
</div> </div>
<div style="clear: both"></div> <div style="clear: both"></div>
<div class="school-index"> <div class="school-index">
<ul id="schoollist" style="line-height: 25px"> <ul id="schoollist" style="line-height: 25px">
</ul>
</ul>
</div> </div>
<% html_title(l(:label_school_all)) -%> <% html_title(l(:label_school_all)) -%>

3
config/locales/zh.yml
View File

@ -2056,8 +2056,7 @@ zh:
label_x_activity: label_x_activity:
zero: 个动态 zero: 个动态
one: 个动态 one: 个动态
other: 个动态 other: 个动态
label_school_all: 中国高校
label_upload_files: 上传资源 label_upload_files: 上传资源
label_relation_files: 关联已有资源 label_relation_files: 关联已有资源
label_contest_settings: 配置竞赛 label_contest_settings: 配置竞赛