|
|
|
@ -74,9 +74,10 @@ class WordsController < ApplicationController
|
|
|
|
|
# render 'test/index'
|
|
|
|
|
# }
|
|
|
|
|
format.js {
|
|
|
|
|
#@reply_type = params[:reply_type]
|
|
|
|
|
@user_activity_id = params[:user_activity_id]
|
|
|
|
|
@activity = JournalsForMessage.find(parent_id)
|
|
|
|
|
@is_activity = params[:is_activity]
|
|
|
|
|
@is_activity = params[:is_activity] if params[:is_activity]
|
|
|
|
|
}
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
@ -98,6 +99,10 @@ class WordsController < ApplicationController
|
|
|
|
|
@user_activity_id = params[:user_activity_id] if params[:user_activity_id]
|
|
|
|
|
@is_activity = params[:is_activity].to_i if params[:is_activity]
|
|
|
|
|
@activity = @journal_destroyed.parent if @journal_destroyed.parent
|
|
|
|
|
unless @activity
|
|
|
|
|
redirect_to feedback_path(@user)
|
|
|
|
|
return
|
|
|
|
|
end
|
|
|
|
|
elsif @journal_destroyed.jour_type == 'HomeworkCommon'
|
|
|
|
|
@homework = HomeworkCommon.find @journal_destroyed.jour_id
|
|
|
|
|
if params[:user_activity_id]
|
|
|
|
|