Permalink
Browse files

Enable using the installer when running at the activity level

  • Loading branch information...
1 parent f8be27a commit 7d996ff89f01a405f484f313f7938074436b7cee @psndcsrv psndcsrv committed Jun 5, 2012
Showing with 7 additions and 1 deletion.
  1. +7 −1 app/controllers/activities_controller.rb
@@ -158,7 +158,13 @@ def show
end
}
format.run_html { render :show, :layout => "layouts/run" }
- format.jnlp { render :partial => 'shared/show', :locals => { :runnable => @activity, :teacher_mode => @teacher_mode } }
+ format.jnlp {
+ if params.delete(:skip_installer)
+ render :partial => 'shared/show', :locals => { :runnable => @activity, :teacher_mode => @teacher_mode }
+ else
+ render :partial => 'shared/installer', :locals => { :runnable => @activity, :teacher_mode => @teacher_mode }
+ end
+ }
format.config { render :partial => 'shared/show', :locals => { :runnable => @activity, :teacher_mode => @teacher_mode, :session_id => (params[:session] || request.env["rack.session.options"][:id]) } }
format.dynamic_otml {
learner = (params[:learner_id] ? Portal::Learner.find(params[:learner_id]) : nil)

0 comments on commit 7d996ff

Please sign in to comment.