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

修改一些bug

This commit is contained in:
ouyangxuhua 2016-01-14 21:29:43 +08:00
parent 5097f19ec8
commit 7ad377f458
6 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/files/_org_subfield_list.html.erb
View File

@ -17,6 +17,7 @@
<span class="img_private ml5">私有</span>
<%end %>
</span>
<br/>
</div>
<div class="mt5">
<span class="fontGrey2 mr15 fl">上传时间：<%= format_date(file.created_on)%></span>

2
app/views/files/_subfield_files.html.erb
View File

@ -50,7 +50,7 @@
<div>
<div class="re_con_top">
<div class="files_tag" id="files_tag">
<%#= render :partial => "files/subfield_tags", :locals => {:tag_list => @tag_list,:org_subfield => @org_subfield,:tag_name => @tag_name}%>
<%= render :partial => "files/subfield_tags", :locals => {:tag_list => @tag_list,:org_subfield => @org_subfield,:tag_name => @tag_name}%>
</div>
<div class="cl"></div>
<p class="f_l fontBlue f_b f_14">共有&nbsp;<span id="attachment_count"><%= @all_attachments.count %></span>&nbsp;个资源</p>

6
app/views/files/create.js.erb
View File

@ -60,9 +60,9 @@ $('#upload_file_div').slideToggle('slow');
$("#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>');
$("#org_subfield_list").prepend(div);
setTimeout( function(){div.remove();},3000);
// var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
// $("#org_subfield_list").prepend(div);
// setTimeout( function(){div.remove();},3000);
<% end %>
<% end %>
<% end %>

12
app/views/organizations/_subfield_list.html.erb
View File

@ -28,9 +28,15 @@
<li class="orgListStatus">新增</li>
<li class="orgListStatus"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
<li class="orgListUser hidden">
<div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;" title="双击可编辑">
<%= field.subfield_subdomain_dir.nil? ? '未设置': field.subfield_subdomain_dir.name %>
</div>
<% if @organization.domain %>
<div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;" title="双击可编辑">
<%= field.subfield_subdomain_dir.nil? ? '未设置': field.subfield_subdomain_dir.name %>
</div>
<% else %>
<div id="sub_dir_show_<%= field.id %>" >
<%= field.subfield_subdomain_dir.nil? ? '未设置': field.subfield_subdomain_dir.name %>
</div>
<% end %>
<div id="sub_dir_edit_<%= field.id %>" style="display:none;">
<input type="text" name="name" onblur="update_sub_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>','<%= field.id %>',$(this).val());" value="<%= field.subfield_subdomain_dir.nil? ? '': field.subfield_subdomain_dir.name %>" style="width:70px;"/>
</div>

1
app/views/tags/update_org_subfield_tag_name.js.erb
View File

@ -8,4 +8,5 @@
<% else %>
$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'files/org_subfield_list',
:locals => {org_subfield: @org_subfield,all_attachments: @all_attachments,sort:@sort,order:@order,org_subfield_attachments:@obj_attachments}) %>");
$("#files_tag").html("<%= j(render :partial => "files/subfield_tags", :locals => {:tag_list => @tag_list,:org_subfield => @org_subfield,:tag_name => @tag_name}) %>")
<% end %>

1
config/routes.rb
View File

@ -73,6 +73,7 @@ RedmineApp::Application.routes.draw do
end
end
get '/', to: 'organizations#show', constraints:lambda{|request|Organization.where("domain is not null").map(&:domain).include?(request.subdomain)}
Organization.where("domain is not null").each do |org|
# org_domains = []
# org_domains << org.domain