gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed typo in app

Browse source
This commit is contained in:
Hiroshi SHIBATA 2020-10-28 09:10:03 +09:00
parent 6e6a6dcd39
commit ab92975803
No known key found for this signature in database
GPG key ID: F9CF13417264FAC2
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/booths_controller.rb
View file

@ -10,7 +10,7 @@ module Admin
@booth_export_option = params[:booth_export_option] @booth_export_option = params[:booth_export_option]
respond_to do |format| respond_to do |format|
format.html format.html
# Explicity call #to_json to avoid the use of EventSerializer # Explicitly call #to_json to avoid the use of EventSerializer
format.json { render json: Booth.where(state: :confirmed, program: @program).to_json } format.json { render json: Booth.where(state: :confirmed, program: @program).to_json }
format.xlsx do format.xlsx do
response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.xlsx\"" response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.xlsx\""

2
app/controllers/admin/events_controller.rb
View file

@ -24,7 +24,7 @@ module Admin
respond_to do |format| respond_to do |format|
format.html format.html
# Explicity call #to_json to avoid the use of EventSerializer # Explicitly call #to_json to avoid the use of EventSerializer
format.json { render json: Event.where(state: :confirmed, program: @program).to_json } format.json { render json: Event.where(state: :confirmed, program: @program).to_json }
format.xlsx do format.xlsx do
response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.xlsx\"" response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.xlsx\""

2
app/controllers/admin/tracks_controller.rb
View file

@ -15,7 +15,7 @@ module Admin
respond_to do |format| respond_to do |format|
format.html format.html
# Explicity call #to_json to avoid the use of EventSerializer # Explicitly call #to_json to avoid the use of EventSerializer
format.json { render json: Track.where(state: :confirmed, program: @program).to_json } format.json { render json: Track.where(state: :confirmed, program: @program).to_json }
format.xlsx do format.xlsx do
response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.xlsx\"" response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.xlsx\""

2
app/controllers/application_controller.rb
View file

@ -52,7 +52,7 @@ class ApplicationController < ActionController::Base
Rails.logger.debug('IChain Record was not Unique!') Rails.logger.debug('IChain Record was not Unique!')
sign_out(current_user) sign_out(current_user)
redirect_to root_path, redirect_to root_path,
error: 'Your E-Mail adress is already registered at OSEM. Please contact the admin if you want to attach your openSUSE Account to OSEM!' error: 'Your E-Mail address is already registered at OSEM. Please contact the admin if you want to attach your openSUSE Account to OSEM!'
end end
rescue_from UserDisabled do rescue_from UserDisabled do

2
app/helpers/application_helper.rb
View file

@ -69,7 +69,7 @@ module ApplicationHelper
Comment.accessible_by(current_ability).find_since_last_login(user) Comment.accessible_by(current_ability).find_since_last_login(user)
end end
# Recieves a PaperTrail::Version object # Receives a PaperTrail::Version object
# Outputs the list of attributes that were changed in the version (ignoring changes from one blank value to another) # Outputs the list of attributes that were changed in the version (ignoring changes from one blank value to another)
# Eg: If version.changeset = '{"title"=>[nil, "Premium"], "description"=>[nil, "Premium = Super cool"], "conference_id"=>[nil, 3]}' # Eg: If version.changeset = '{"title"=>[nil, "Premium"], "description"=>[nil, "Premium = Super cool"], "conference_id"=>[nil, 3]}'
# Output will be 'title, description and conference' # Output will be 'title, description and conference'