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

Merge branch 'yuanke' into develop

This commit is contained in:
huang 2016-05-20 20:31:39 +08:00
parent 90bb940290 d4be470e5f
commit acb6d5892d
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/at_controller.rb
View File

@ -68,7 +68,7 @@ class AtController < ApplicationController
end
def find_project(id)
return [] if id<0
return [] if id.to_i<0
at_persons = Project.find(id).users
at_persons.delete_if { |u| u.id == User.current.id }
end

16
app/controllers/org_document_comments_controller.rb
View File

@ -102,13 +102,15 @@ class OrgDocumentCommentsController < ApplicationController
end
def destroy
@org_document_comment = OrgDocumentComment.find(params[:id])
org = @org_document_comment.organization
if @org_document_comment.id == org.home_id
org.update_attributes(:home_id => nil)
end
if @org_document_comment.destroy
end
@org_document_comment = SubDocumentComment.find(params[:id])
@sub_domain = @org_document_comment.sub_domain
@org_subfield = @sub_domain.org_subfield
# org = @org_document_comment.organization
# if @org_document_comment.id == org.home_id
# org.update_attributes(:home_id => nil)
# end
@org_document_comment.destroy
# end
respond_to do |format|
format.js
end

2
app/views/org_document_comments/destroy.js.erb
View File

@ -1,6 +1,6 @@
//location.reload();
<% if params[:detail_page] %>
window.location.href = '<%= organization_org_document_comments_path(:organization_id => @org_document_comment.root.organization_id)%>';
window.location.href = '<%= org_subfield_sub_domain_sub_document_comments_path(:org_subfield_id => @org_subfield.id, :sub_domain_id => @sub_domain.id)%>';
<% else %>
window.location.reload();
<% end %>