diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index b15be4896..c894680a6 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -186,7 +186,7 @@ class FilesController < ApplicationController
@order = ""
@is_remote = false
if params[:project_id]
- @isproject = true
+ @container_type = 0
if params[:sort]
params[:sort].split(",").each do |sort_type|
@@ -246,7 +246,7 @@ class FilesController < ApplicationController
format.js
end
elsif params[:course_id]
- @isproject = false
+ @container_type = 1
if params[:sort]
params[:sort].split(",").each do |sort_type|
@@ -297,6 +297,9 @@ class FilesController < ApplicationController
@tag_list = attachment_tag_list @all_attachments
render :layout => 'base_courses'
+ elsif params[:org_subfield_id]
+ @container_type = 2
+ # @subfield = params[:org_subfield_id]
end
end
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index 9c9e0a1be..57ea46658 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -25,8 +25,12 @@
<% organization.org_subfields.each do |field| %>
diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index 6ba60245a..642a5ffd0 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -1,22 +1,26 @@
<% subfields.each do |field| %>
@@ -24,6 +28,7 @@
<%= field.name %>
新增
+ <%= field.field_type == "Post" ? "帖子":"资源" %>
<%= link_to "删除",org_subfield_path(field), :method => 'delete',:remote => true, :confirm => "您确定删除吗?", :class => "linkBlue fr mr5" %>
编辑
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index 220120346..c46cfc6e2 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -68,4 +68,6 @@ a.linkGrey8:hover {color:#585858;}
.orgMenuArrow {background:url(../images/nav_icon.png) -10px -165px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}
.orgMenuArrow2 {background:url(../images/nav_icon.png) -10px -132px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}
.org_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-53px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 30px;}
-#orgUserName {max-width:50px; overflow:hidden; white-space: nowrap; text-overflow: ellipsis; display:inline-block;}
\ No newline at end of file
+#orgUserName {max-width:50px; overflow:hidden; white-space: nowrap; text-overflow: ellipsis; display:inline-block;}
+
+.orgListStatus {width:55px; float:left;}
\ No newline at end of file