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

组织添加项目/组织弹窗，点击取消后，关闭弹窗。

This commit is contained in:
ouyangxuhua 2015-12-15 10:47:35 +08:00
parent 3efb36a28e
commit d9df926c2b
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/files_controller.rb
View File

@ -539,8 +539,7 @@ class FilesController < ApplicationController
'size' => "#{Attachment.table_name}.filesize", 'size' => "#{Attachment.table_name}.filesize",
'downloads' => "#{Attachment.table_name}.downloads" 'downloads' => "#{Attachment.table_name}.downloads"
@containers = [OrgSubfield.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@org_subfield.id)] #modify by Long Jun @containers = [OrgSubfield.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@org_subfield.id)]
# @containers += @org_subfield.versions.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").all.sort
show_attachments @containers show_attachments @containers

14
app/views/files/_upload_subfield_file.html.erb
View File

@ -7,8 +7,18 @@
<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, :in_org => params[:in_org]), :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> --> <!--<%# if params[:in_org] %>-->
<!--<input type="hidden" name="in_org_subfield_toolbar" value="Y">--> <!--<div class="c_dark">-->
<!--<input name="org_subfield_attachment_type[]" type="radio" value="1" checked class="c_dark" >课件</input>&nbsp;<span class="c_grey">|</span>&nbsp;-->
<!--<input name="org_subfield_attachment_type[]" type="radio" value="2" class="c_dblue">软件</input>&nbsp;<span class="c_grey">|</span>&nbsp;-->
<!--<input name="org_subfield_attachment_type[]" type="radio" value="3" class="c_dblue">媒体</input>&nbsp;<span class="c_grey">|</span>&nbsp;-->
<!--<input name="org_subfield_attachment_type[]" type="radio" value="4" class="c_dblue">代码</input>&nbsp;<span class="c_grey">|</span>&nbsp;-->
<!--<input name="org_subfield_attachment_type[]" type="radio" value="6" class="c_dblue">论文</input>&nbsp;<span class="c_grey">|</span>&nbsp;-->
<!--<input name="org_subfield_attachment_type[]" type="radio" value="5" class="c_dblue">其他</input></a>-->
<!--</div>-->
<!--<%# else %>-->
<!--<input type="hidden" name="org_subfield_attachment_type" value="<%#= org_subfield_attachment_type%>">-->
<!--<%# end %>-->
<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%>">
<%= render :partial => 'files/attachement_list'%> <%= render :partial => 'files/attachement_list'%>
<div class="cl"></div> <div class="cl"></div>

2
app/views/organizations/_join_course_menu.html.erb
View File

@ -33,7 +33,7 @@
<div class="courseSendSubmit"> <div class="courseSendSubmit">
<a href="javascript:void(0);" onclick="org_join_courses(<%= organization_id %>);" class="sendSourceText">关联</a> <a href="javascript:void(0);" onclick="org_join_courses(<%= organization_id %>);" class="sendSourceText">关联</a>
</div> </div>
<div class="courseSendCancel"><a href="javascript:void(0);" onclick="cancel_join_courses();" class="sendSourceText">取消</a></div> <div class="courseSendCancel"><a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a></div>
<% end %> <% end %>
</div> </div>

2
app/views/organizations/_join_project_menu.html.erb
View File

@ -33,7 +33,7 @@
<div class="courseSendSubmit"> <div class="courseSendSubmit">
<a href="javascript:void(0);" onclick="org_join_projects(<%= organization_id %>);" class="sendSourceText">关联</a> <a href="javascript:void(0);" onclick="org_join_projects(<%= organization_id %>);" class="sendSourceText">关联</a>
</div> </div>
<div class="courseSendCancel"><a href="javascript:void(0);" onclick="cancel_join_projects();" class="sendSourceText">取消</a></div> <div class="courseSendCancel"><a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a></div>
<% end %> <% end %>
</div> </div>
<div class="cl"></div> <div class="cl"></div>