Fixed some typos (#2695)

* Fix typos
This commit is contained in:
Hiroshi SHIBATA 2020-10-30 18:06:43 +09:00 committed by GitHub
parent 87144caeb3
commit ae98ac1430
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 8 deletions

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\""

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\""

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\""

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

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'

View file

@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
namespace :events_registrations do namespace :events_registrations do
desc "Deletes dupicate entries" desc "Deletes duplicate entries"
task deduplicate: :environment do task deduplicate: :environment do
if ActiveRecord::Migrator.get_all_versions.include? 20160403214841 if ActiveRecord::Migrator.get_all_versions.include? 20160403214841
duplicates = EventsRegistration.all.map { |er| er.id if er.valid? == false}.compact duplicates = EventsRegistration.all.map { |er| er.id if er.valid? == false}.compact

View file

@ -376,7 +376,7 @@ feature 'Version' do
EventsRegistration.create(registration: registration, event: event) EventsRegistration.create(registration: registration, event: event)
EventsRegistration.first.update_attributes(attended: true) EventsRegistration.first.update_attributes(attended: true)
EventsRegistration.last.destroy EventsRegistration.last.destroy
# Here registration is deleted to ensure the event registration related change still displays the asociated user's name # Here registration is deleted to ensure the event registration related change still displays the associated user's name
registration.destroy registration.destroy
visit admin_revision_history_path visit admin_revision_history_path

View file

@ -165,7 +165,7 @@ describe Conference do
end end
describe '#get_submissions_data' do describe '#get_submissions_data' do
it 'returns emtpy hash if there is no cfp or events' do it 'returns empty hash if there is no cfp or events' do
expect(subject.get_submissions_data).to eq [] expect(subject.get_submissions_data).to eq []
end end