在组织非资源栏目页面中,添加资源后跳转至资源栏目页面。

dev_zanle
ouyangxuhua 10 years ago
parent a5fa68c928
commit 3efb36a28e

@ -549,9 +549,9 @@ class FilesController < ApplicationController
respond_to do |format| respond_to do |format|
format.js format.js
format.html { # format.html {
redirect_to org_subfield_files_url(@org_subfield) # redirect_to org_subfield_files_url(@org_subfield)
} # }
end end
end end
end end

@ -6,7 +6,7 @@
<%= error_messages_for 'attachment' %> <%= error_messages_for 'attachment' %>
<div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div> <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
<%= form_tag(org_subfield_files_path(org_subfield), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %> <%= form_tag(org_subfield_files_path(org_subfield, :in_org => params[:in_org]), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
<!-- <label style="margin-top:3px;"><#%= l(:label_file_upload)%></label> --> <!-- <label style="margin-top:3px;"><#%= l(:label_file_upload)%></label> -->
<!--<input type="hidden" name="in_org_subfield_toolbar" value="Y">--> <!--<input type="hidden" name="in_org_subfield_toolbar" value="Y">-->
<input type="hidden" name="org_subfield_attachment_type" value="<%= org_subfield_attachment_type%>"> <input type="hidden" name="org_subfield_attachment_type" value="<%= org_subfield_attachment_type%>">

@ -53,16 +53,18 @@ $('#upload_file_div').slideToggle('slow');
<% end %> <% end %>
<%end%> <%end%>
<% elsif @org_subfield %> <% elsif @org_subfield %>
hideModal(); <% if params[:in_org] %>
$("#resource_list").html('<%= j(render partial: "subfield_files" ,locals: {org_subfield: @org_subfield}) %>'); window.location.href = '<%= org_subfield_files_path @org_subfield %>';
// $("#courses_files_count_info").html("<%#= @all_attachments.count%>"); <%else %>
// $("#courses_files_count_nav").html("(<%#= @all_attachments.count%>)") hideModal();
// 添加文件上传成功提示, $("#resource_list").html('<%= j(render partial: "subfield_files" ,locals: {org_subfield: @org_subfield}) %>');
<% unless params[:attachments].nil? %> // 添加文件上传成功提示,
var div = $('<div id="addBox" class="flash notice">文件上传成功!</div>'); <% unless params[:attachments].nil? %>
$("#org_subfield_list").prepend(div); var div = $('<div id="addBox" class="flash notice">文件上传成功!</div>');
setTimeout( function(){div.remove();},3000) $("#org_subfield_list").prepend(div);
<% end %> setTimeout( function(){div.remove();},3000);
<% end %>
<% end %>
<% end %> <% end %>
<% end %> <% end %>
$(document).ready(img_thumbnails); $(document).ready(img_thumbnails);

@ -31,7 +31,7 @@
<% else %> <% else %>
<%= link_to "#{field.name}", org_subfield_files_path(field), :class => "homepageMenuText" %> <%= link_to "#{field.name}", org_subfield_files_path(field), :class => "homepageMenuText" %>
<% if User.current.member_of_org?organization %> <% if User.current.member_of_org?organization %>
<%= link_to "", subfield_upload_file_org_subfield_files_path(field.id),:method => "post", :remote => true, :class => "homepageMenuSetting fr", :title => "上传资源" %> <%= link_to "", subfield_upload_file_org_subfield_files_path(field.id, :in_org => 1),:method => "post", :remote => true, :class => "homepageMenuSetting fr", :title => "上传资源" %>
<!--<a class="homepageMenuSetting fr" title="上传资源" href="javascript:void(0);" onclick="org_subfield_files_upload(<%#= field.id %>);"> </a>--> <!--<a class="homepageMenuSetting fr" title="上传资源" href="javascript:void(0);" onclick="org_subfield_files_upload(<%#= field.id %>);"> </a>-->
<% end %> <% end %>
<!--<a href="javascript:void(0);" class="homepageMenuText"><%#= field.name %></a>--> <!--<a href="javascript:void(0);" class="homepageMenuText"><%#= field.name %></a>-->

Loading…
Cancel
Save