- <%#= 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}%>
共有 <%= @all_attachments.count %> 个资源
diff --git a/app/views/files/create.js.erb b/app/views/files/create.js.erb
index 49198e680..1d66c2955 100644
--- a/app/views/files/create.js.erb
+++ b/app/views/files/create.js.erb
@@ -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 = $('
文件上传成功!
');
- $("#org_subfield_list").prepend(div);
- setTimeout( function(){div.remove();},3000);
+// var div = $('
文件上传成功!
');
+// $("#org_subfield_list").prepend(div);
+// setTimeout( function(){div.remove();},3000);
<% end %>
<% end %>
<% end %>
diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index 10cf6fc00..b49436d4e 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -28,9 +28,15 @@
新增
<%= field.field_type == "Post" ? "帖子" : "资源" %>
-
- <%= field.subfield_subdomain_dir.nil? ? '未设置': field.subfield_subdomain_dir.name %>
-
+ <% if @organization.domain %>
+
+ <%= field.subfield_subdomain_dir.nil? ? '未设置': field.subfield_subdomain_dir.name %>
+
+ <% else %>
+
+ <%= field.subfield_subdomain_dir.nil? ? '未设置': field.subfield_subdomain_dir.name %>
+
+ <% end %>
diff --git a/app/views/tags/update_org_subfield_tag_name.js.erb b/app/views/tags/update_org_subfield_tag_name.js.erb
index 4fabc1afd..418d05363 100644
--- a/app/views/tags/update_org_subfield_tag_name.js.erb
+++ b/app/views/tags/update_org_subfield_tag_name.js.erb
@@ -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 %>
diff --git a/config/routes.rb b/config/routes.rb
index 08163a395..a86ed21f0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -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