diff --git a/app/controllers/sub_document_comments_controller.rb b/app/controllers/sub_document_comments_controller.rb index 2e0890e27..d58734c8f 100644 --- a/app/controllers/sub_document_comments_controller.rb +++ b/app/controllers/sub_document_comments_controller.rb @@ -102,7 +102,7 @@ class SubDocumentCommentsController < ApplicationController @subdomain = @document.sub_domain @org_subfield = @subdomain.org_subfield @organization = @org_subfield.organization - @act = OrgActivity.find(params[:id]) + @act = OrgActivity.find(params[:act_id]) @comment = SubDocumentComment.new(:sub_domain_id => @document.sub_domain, :creator_id => User.current.id, :reply_id => params[:id]) @comment.content = params[:sub_content] @document.children << @comment diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb index 9fe25ce95..7721eeb0d 100644 --- a/app/views/layouts/_base_feedback.html.erb +++ b/app/views/layouts/_base_feedback.html.erb @@ -158,6 +158,8 @@ function cookieget(n) }) +<% forum = Forum.where(:id => 1).first %> +<% unless forum.nil? %>