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

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
cxt 2016-06-02 13:56:29 +08:00
parent 2431ef6986 22cafdbd05
commit 3d9b7aedb1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/org_document_comments_controller.rb
View File

@ -1,6 +1,6 @@
class OrgDocumentCommentsController < ApplicationController class OrgDocumentCommentsController < ApplicationController
before_filter :find_organization, :only => [:new, :create, :show, :index] before_filter :find_organization, :only => [:new, :create, :show, :index]
before_filter :authorize_allowed, :only => [:create, :add_reply] before_filter :authorize_allowed, :only => [:create]
helper :attachments,:organizations helper :attachments,:organizations
layout 'base_org' layout 'base_org'

2
app/controllers/sub_document_comments_controller.rb
View File

@ -1,7 +1,7 @@
class SubDocumentCommentsController < ApplicationController class SubDocumentCommentsController < ApplicationController
before_filter :find_subdomain_and_subfield, :only => [:new, :create, :show, :index, :destroy, :edit] before_filter :find_subdomain_and_subfield, :only => [:new, :create, :show, :index, :destroy, :edit]
before_filter :find_subfield_content, :only => [:show, :index] before_filter :find_subfield_content, :only => [:show, :index]
before_filter :authorize_allowed, :only => [:create, :add_reply] before_filter :authorize_allowed, :only => [:create]
helper :attachments,:organizations helper :attachments,:organizations
layout 'base_sub_domain' layout 'base_sub_domain'

8
app/views/layouts/base_org2.html.erb
View File

@ -98,27 +98,27 @@
<% else %> <% else %>
<% if field.field_type == "Post" && field.hide == 0 %> <% if field.field_type == "Post" && field.hide == 0 %>
<li class="nav-element"> <li class="nav-element">
<a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a> <%= link_to field.name, organization_path(@organization, :org_subfield_id => field.id), :class => "sn-link-white", :target => "_blank" %>
</li> </li>
<!--二级目录--> <!--二级目录-->
<div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;"> <div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">
<ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;"> <ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;">
<% field.sub_domains.each do |subdomain| %> <% field.sub_domains.each do |subdomain| %>
<li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => field.id), :class => "sn-link-grey" %></li> <li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => field.id), :class => "sn-link-grey", :target => "_blank" %></li>
<li class="sn-subnav-slice">|</li> <li class="sn-subnav-slice">|</li>
<% end %> <% end %>
</ul> </ul>
</div> </div>
<% elsif field.field_type == "Resource" && field.hide == 0 %> <% elsif field.field_type == "Resource" && field.hide == 0 %>
<li class="nav-element"> <li class="nav-element">
<a href="#resource_<%= field.id %>" class="sn-link-white"><%= field.name %></a> <%= link_to field.name, org_subfield_files_path(field), :class => "sn-link-white", :target => "_blank" %>
</li> </li>
<% end %> <% end %>
<% end %> <% end %>
<% end %> <% end %>
<% if User.current.admin_of_org?(@organization) %> <% if User.current.admin_of_org?(@organization) %>
<li class="nav-element"> <li class="nav-element">
<a href="<%= setting_organization_path(@organization) %>" class="sn-link-white">配置</a> <a href="<%= setting_organization_path(@organization) %>" class="sn-link-white" target ="_blank">配置</a>
</li> </li>
<% end %> <% end %>
</ul> </ul>