htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated rails from 4.1.13 to 4.2.5. This is required for rails to make use of new features in postgres 9.5

Browse Source 
@Ralf
TODO: migration /Users/groucho/Documents/HPI/workspace/Xikolo-CodeOcean/codeocean/db/migrate/20160204111716_add_user_to_code_harbor_link.rb
is broken. A reference is made to table users which does not exist.
Workaround: run rake db:schema:load before running db:migrate. Still this should be fixed.
This commit is contained in:
Tom Staubitz
2016-12-31 00:05:23 +01:00
parent 930f417a9f
commit ca28e0aa87
19 changed files with 1503 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/concerns/lti.rb
View File

@ -104,10 +104,8 @@ module Lti
lti_parameter = LtiParameter.where(consumers_id: session[:consumer_id],
external_user_id: session[:external_user_id],
exercises_id: exercise_id).first
lti_parameters = JSON.parse(lti_parameter.lti_parameters)
consumer = Consumer.find_by(id: session[:consumer_id])
provider = build_tool_provider(consumer: consumer, parameters: lti_parameters)
provider = build_tool_provider(consumer: consumer, parameters: lti_parameter.lti_parameters)
# provider = build_tool_provider(consumer: Consumer.find_by(id: session[:consumer_id]), parameters: session[:lti_parameters])
if provider.nil?
{status: 'error'}