forked from spen/seminar
parent
8edb6de807
commit
e7a0d13a38
|
@ -1,7 +1,7 @@
|
||||||
class SeminarsController < ApplicationController
|
class SeminarsController < ApplicationController
|
||||||
|
|
||||||
helper MemberHelper
|
helper MemberHelper
|
||||||
include ActionView::Context
|
include ActionView::Context #vary important (only add this can access @@session from view)
|
||||||
include Admin::SeminarsHelper
|
include Admin::SeminarsHelper
|
||||||
# include SimpleCaptcha::ControllerHelpers
|
# include SimpleCaptcha::ControllerHelpers
|
||||||
def index
|
def index
|
||||||
|
@ -204,13 +204,11 @@ class SeminarsController < ApplicationController
|
||||||
|
|
||||||
def add_file
|
def add_file
|
||||||
|
|
||||||
session = OrbitHelper.get_session
|
if !@@session[:seminar_main_id].blank?
|
||||||
|
|
||||||
if !session[:seminar_main_id].blank?
|
seminar = SeminarMain.find_by(id: @@session[:seminar_main_id])
|
||||||
|
|
||||||
seminar = SeminarMain.find_by(id: session[:seminar_main_id])
|
seminar_signup = SeminarSignup.find_by(_id: @@session[:seminar_signup_id], seminar_main_id: @@session[:seminar_main_id] )
|
||||||
|
|
||||||
seminar_signup = SeminarSignup.find_by(_id: session[:seminar_signup_id], seminar_main_id: session[:seminar_main_id] )
|
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
|
@ -245,13 +243,11 @@ class SeminarsController < ApplicationController
|
||||||
|
|
||||||
time_now = Time.now
|
time_now = Time.now
|
||||||
|
|
||||||
session = OrbitHelper.get_session
|
if !@@session[:seminar_main_id].blank?
|
||||||
|
|
||||||
if !session[:seminar_main_id].blank?
|
seminar = SeminarMain.find_by(id: @@session[:seminar_main_id])
|
||||||
|
|
||||||
seminar = SeminarMain.find_by(id: session[:seminar_main_id])
|
seminar_signup = SeminarSignup.find_by(_id: @@session[:seminar_signup_id], seminar_main_id: @@session[:seminar_main_id] )
|
||||||
|
|
||||||
seminar_signup = SeminarSignup.find_by(_id: session[:seminar_signup_id], seminar_main_id: session[:seminar_main_id] )
|
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue