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

Merge branch 'develop' into cxt_course

This commit is contained in:
cxt 2016-02-26 17:35:13 +08:00
parent 1f25dd4174 6e85b38b09
commit 6d1667b4ae
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/blogs_controller.rb
View File

@ -29,7 +29,7 @@ class BlogsController < ApplicationController
def set_homepage def set_homepage
@blog = Blog.find(params[:id]) @blog = Blog.find(params[:id])
@blog.update_attribute(:homepage_id, params[:article_id]) @blog.update_attribute(:homepage_id, params[:article_id])
redirect_to user_blogs_path(params[:user_id]) redirect_to user_path(params[:user_id])
end end
def cancel_homepage def cancel_homepage

2
app/views/org_subfields/_show_details.html.erb
View File

@ -42,7 +42,7 @@
}); });
</script> </script>
<% if act.container_type == 'Organization' %> <% if act.container_type == 'Organization' %>
<% if act.org_act_type == 'OrgDocumentComment' && act.org_act_id != @organization.home_id %> <% if act.org_act_type == 'OrgDocumentComment' %>
<%= render :partial => 'organizations/show_org_document', :locals => {:document => act.org_act, :act => act, :flag => 2, :org_subfield_id => params[:org_subfield_id]} %> <%= render :partial => 'organizations/show_org_document', :locals => {:document => act.org_act, :act => act, :flag => 2, :org_subfield_id => params[:org_subfield_id]} %>
<% end %> <% end %>
<% end %> <% end %>