Merge branch 'master' into 'master'
Fix bug, See merge request spen/seminar!53
This commit is contained in:
commit
18a5606856
|
@ -4,7 +4,7 @@ class SeminarsController < ApplicationController
|
||||||
include MemberHelper
|
include MemberHelper
|
||||||
include ActionView::Context #vary important (only add this can access @@session from view)
|
include ActionView::Context #vary important (only add this can access @@session from view)
|
||||||
include Admin::SeminarsHelper
|
include Admin::SeminarsHelper
|
||||||
FrontendMethods = ["show_privacy", "show_data", "check_email", "check_availability", "signup_ok", "edit_file", "con_login", "con_upload", "con_logout"]
|
FrontendMethods = ["show_privacy", "show_data", "check_email", "check_availability", "signup_ok", "add_file", "edit_file", "con_login", "con_upload", "con_logout"]
|
||||||
# include SimpleCaptcha::ControllerHelpers
|
# include SimpleCaptcha::ControllerHelpers
|
||||||
def index
|
def index
|
||||||
|
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue