From 80296619175abe1286cbeb3ce07cd93efc0675e7 Mon Sep 17 00:00:00 2001 From: Jonathan Rosenbaum Date: Thu, 23 Dec 2021 14:28:32 -0500 Subject: [PATCH] Adds the changes from bikebike/bikebike for tracked files that weren't committed to git. Former-commit-id: 23acad3a6de4f349390d87a88884b754abefdcfb --- app/controllers/application_controller.rb | 31 +++-- app/mailers/user_mailer.rb | 2 + app/views/layouts/application.html.haml | 2 +- config/locales/es.yml | 6 +- db/schema.rb | 158 +++++++++++----------- 5 files changed, 102 insertions(+), 97 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 156472a..35f8022 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -232,20 +232,23 @@ class ApplicationController < BaseController request_info['env'][key.to_s] = value.to_s end - send_delayed_mail(:contact, - current_user || params[:email], - params[:subject], - params[:message], - email_list - ) - - send_delayed_mail(:contact_details, - current_user || params[:email], - params[:subject], - params[:message], - request_info, - params - ) + if !(params[:subject] =~ /^\s*[a-z]{10}\s*$/i) + + send_delayed_mail(:contact, + current_user || params[:email], + params[:subject], + params[:message], + email_list + ) + + send_delayed_mail(:contact_details, + current_user || params[:email], + params[:subject], + params[:message], + request_info, + params + ) + end redirect_to contact_sent_path end diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 300504c..f2fdf61 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -149,6 +149,7 @@ class UserMailer < ActionMailer::Base end def contact(from, subject, message, email_list) + return if subject =~ /^[a-z]{10}$/ @message = message @from = from.is_a?(Integer) ? User.find(from) : from @@ -156,6 +157,7 @@ class UserMailer < ActionMailer::Base end def contact_details(from, subject, message, request, params) + return if subject =~ /^[a-z]{10}$/ @message = message @from = from.is_a?(Integer) ? User.find(from) : from @request = request diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 8ac3abf..21735a7 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -10,7 +10,7 @@ = stylesheets %link{ href: asset_path(@favicon), rel: 'shortcut icon', type: 'image/x-icon' } %link{ href: asset_path(@favicon), rel: 'icon', type: 'image/x-icon' } - - @alt_lang_urls.each do |locale, url| + - (@alt_lang_urls || []).each do |locale, url| %link{ rel: :alternate, hreflang: locale, href: url } %link{ href: canonical_url, rel: :canonical } - if content_for?(:og_image) diff --git a/config/locales/es.yml b/config/locales/es.yml index 7ed10a8..21e871e 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1346,7 +1346,7 @@ es: can_provide_housing: "¿Puedes proporcionar hospedaje a quienes visitan la ciudad?" Verify_Account: Verifica tu cuenta - policy: Normatividad + policy: Normas Contact_Info: Información de contacto contact_info: Información de contacto Administration: Administrar cuenta @@ -1733,7 +1733,7 @@ es: org_select: Organización payment_form: Cantidad a pagar por registro payment_type: Método de pago para el registro - policy: Normatividad + policy: Normas housing_bike: Necesitas bici? warning: companion_unregistered: Tu acompañante no se ha registrado. Por favor aseguráte @@ -2059,7 +2059,7 @@ es: Locale_Not_Available: Locale no disponible '500': An_Error_Occurred: Ocurrió un error - Policy: Normatividad + Policy: Normas About: Acerca de Register: Regístrate Pre_Register: Pre-Regístrate diff --git a/db/schema.rb b/db/schema.rb index 90d77e5..03f8af5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -27,9 +27,9 @@ ActiveRecord::Schema.define(version: 20170817000540) do end create_table "authentications", force: :cascade do |t| - t.integer "user_id", null: false - t.string "provider", null: false - t.string "uid", null: false + t.integer "user_id", null: false + t.string "provider", limit: 255, null: false + t.string "uid", limit: 255, null: false t.datetime "created_at" t.datetime "updated_at" end @@ -103,18 +103,18 @@ ActiveRecord::Schema.define(version: 20170817000540) do create_table "conference_registrations", force: :cascade do |t| t.integer "conference_id" t.integer "user_id" - t.string "is_attending" + t.string "is_attending", limit: 255 t.datetime "created_at" t.datetime "updated_at" t.boolean "is_confirmed" t.boolean "is_participant" t.boolean "is_volunteer" - t.string "confirmation_token" - t.string "email" + t.string "confirmation_token", limit: 255 + t.string "email", limit: 255 t.boolean "complete" t.boolean "completed" - t.string "payment_confirmation_token" - t.string "payment_info" + t.string "payment_confirmation_token", limit: 255 + t.string "payment_info", limit: 255 t.integer "registration_fees_paid" t.string "city" t.datetime "arrival" @@ -135,21 +135,21 @@ ActiveRecord::Schema.define(version: 20170817000540) do end create_table "conference_types", force: :cascade do |t| - t.string "title" - t.string "info" + t.string "title", limit: 255 + t.string "info", limit: 255 t.datetime "created_at" t.datetime "updated_at" - t.string "slug" + t.string "slug", limit: 255 end create_table "conferences", force: :cascade do |t| - t.string "title" - t.string "slug" + t.string "title", limit: 255 + t.string "slug", limit: 255 t.date "start_date" t.date "end_date" t.text "info" - t.string "poster" - t.string "cover" + t.string "poster", limit: 255 + t.string "cover", limit: 255 t.boolean "workshop_schedule_published" t.boolean "registration_open" t.boolean "meals_provided" @@ -162,8 +162,8 @@ ActiveRecord::Schema.define(version: 20170817000540) do t.text "registration_info" t.text "postregistration_info" t.integer "cover_attribution_id" - t.string "cover_attribution_name" - t.string "cover_attribution_src" + t.string "cover_attribution_name", limit: 255 + t.string "cover_attribution_src", limit: 255 t.integer "cover_attribution_user_id" t.string "locale" t.string "email_address" @@ -241,15 +241,15 @@ ActiveRecord::Schema.define(version: 20170817000540) do end create_table "event_types", force: :cascade do |t| - t.string "slug" + t.string "slug", limit: 255 t.text "info" t.datetime "created_at" t.datetime "updated_at" end create_table "events", force: :cascade do |t| - t.string "title" - t.string "slug" + t.string "title", limit: 255 + t.string "slug", limit: 255 t.integer "event_type_id" t.integer "conference_id" t.text "info" @@ -272,16 +272,16 @@ ActiveRecord::Schema.define(version: 20170817000540) do end create_table "locations", force: :cascade do |t| - t.string "title" + t.string "title", limit: 255 t.float "latitude" t.float "longitude" t.datetime "created_at" t.datetime "updated_at" - t.string "country" - t.string "territory" - t.string "city" - t.string "street" - t.string "postal_code" + t.string "country", limit: 255 + t.string "territory", limit: 255 + t.string "city", limit: 255 + t.string "street", limit: 255 + t.string "postal_code", limit: 255 t.integer "city_id" end @@ -295,33 +295,33 @@ ActiveRecord::Schema.define(version: 20170817000540) do add_index "locations_organizations", ["organization_id", "location_id"], name: "loc_org_index", using: :btree create_table "organization_statuses", force: :cascade do |t| - t.string "name" - t.string "slug" - t.string "info" + t.string "name", limit: 255 + t.string "slug", limit: 255 + t.string "info", limit: 255 t.datetime "created_at" t.datetime "updated_at" end create_table "organizations", force: :cascade do |t| - t.string "name" - t.string "slug" - t.string "email_address" - t.string "url" + t.string "name", limit: 255 + t.string "slug", limit: 255 + t.string "email_address", limit: 255 + t.string "url", limit: 255 t.integer "year_founded" t.text "info" - t.string "logo" - t.string "avatar" + t.string "logo", limit: 255 + t.string "avatar", limit: 255 t.boolean "requires_approval" - t.string "secret_question" - t.string "secret_answer" + t.string "secret_question", limit: 255 + t.string "secret_answer", limit: 255 t.integer "user_organization_replationship_id" t.datetime "created_at" t.datetime "updated_at" - t.string "cover" + t.string "cover", limit: 255 t.integer "cover_attribution_id" - t.string "cover_attribution_name" - t.string "cover_attribution_src" - t.string "phone" + t.string "cover_attribution_name", limit: 255 + t.string "cover_attribution_src", limit: 255 + t.string "phone", limit: 255 t.integer "organization_status_id" t.integer "cover_attribution_user_id" t.string "status" @@ -352,11 +352,11 @@ ActiveRecord::Schema.define(version: 20170817000540) do end create_table "registration_form_fields", force: :cascade do |t| - t.string "title" + t.string "title", limit: 255 t.text "help" t.boolean "required" - t.string "field_type" - t.string "options" + t.string "field_type", limit: 255 + t.string "options", limit: 255 t.boolean "is_retired" t.datetime "created_at" t.datetime "updated_at" @@ -383,7 +383,7 @@ ActiveRecord::Schema.define(version: 20170817000540) do end create_table "sessions", force: :cascade do |t| - t.string "session_id", null: false + t.string "session_id", limit: 255, null: false t.text "data" t.datetime "created_at" t.datetime "updated_at" @@ -417,11 +417,11 @@ ActiveRecord::Schema.define(version: 20170817000540) do end create_table "translations", force: :cascade do |t| - t.string "locale" - t.string "key" + t.string "locale", limit: 255 + t.string "key", limit: 255 t.text "value" t.text "interpolations" - t.boolean "is_proc", default: false + t.boolean "is_proc", default: false t.datetime "created_at" t.datetime "updated_at" end @@ -429,34 +429,34 @@ ActiveRecord::Schema.define(version: 20170817000540) do create_table "user_organization_relationships", force: :cascade do |t| t.integer "user_id" t.integer "organization_id" - t.string "relationship" + t.string "relationship", limit: 255 t.datetime "created_at" t.datetime "updated_at" end create_table "users", force: :cascade do |t| t.string "username" - t.string "email" - t.string "crypted_password" - t.string "salt" + t.string "email", limit: 255 + t.string "crypted_password", limit: 255 + t.string "salt", limit: 255 t.datetime "created_at" t.datetime "updated_at" - t.string "remember_me_token" + t.string "remember_me_token", limit: 255 t.datetime "remember_me_token_expires_at" - t.string "reset_password_token" + t.string "reset_password_token", limit: 255 t.datetime "reset_password_token_expires_at" t.datetime "reset_password_email_sent_at" - t.string "activation_state" - t.string "activation_token" + t.string "activation_state", limit: 255 + t.string "activation_token", limit: 255 t.datetime "activation_token_expires_at" - t.integer "failed_logins_count", default: 0 + t.integer "failed_logins_count", default: 0 t.datetime "lock_expires_at" - t.string "unlock_token" - t.string "avatar" + t.string "unlock_token", limit: 255 + t.string "avatar", limit: 255 t.text "about_me" - t.string "role" - t.string "firstname" - t.string "lastname" + t.string "role", limit: 255 + t.string "firstname", limit: 255 + t.string "lastname", limit: 255 t.boolean "is_translator" t.json "languages" t.string "locale" @@ -473,19 +473,19 @@ ActiveRecord::Schema.define(version: 20170817000540) do add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", using: :btree create_table "versions", force: :cascade do |t| - t.string "item_type" + t.string "item_type", limit: 255 t.integer "item_id" - t.string "event" - t.string "whodunnit" + t.string "event", limit: 255 + t.string "whodunnit", limit: 255 t.text "object" t.datetime "created_at" - t.string "value" + t.string "value", limit: 255 end create_table "workshop_facilitators", force: :cascade do |t| t.integer "user_id" t.integer "workshop_id" - t.string "role" + t.string "role", limit: 255 t.datetime "created_at" t.datetime "updated_at" end @@ -498,9 +498,9 @@ ActiveRecord::Schema.define(version: 20170817000540) do end create_table "workshop_presentation_styles", force: :cascade do |t| - t.string "name" - t.string "slug" - t.string "info" + t.string "name", limit: 255 + t.string "slug", limit: 255 + t.string "info", limit: 255 t.datetime "created_at" t.datetime "updated_at" t.integer "order" @@ -509,31 +509,31 @@ ActiveRecord::Schema.define(version: 20170817000540) do create_table "workshop_requested_resources", force: :cascade do |t| t.integer "workshop_id" t.integer "workshop_resource_id" - t.string "status" + t.string "status", limit: 255 t.datetime "created_at" t.datetime "updated_at" end create_table "workshop_resources", force: :cascade do |t| - t.string "name" - t.string "slug" - t.string "info" + t.string "name", limit: 255 + t.string "slug", limit: 255 + t.string "info", limit: 255 t.datetime "created_at" t.datetime "updated_at" end create_table "workshop_streams", force: :cascade do |t| - t.string "name" - t.string "slug" - t.string "info" + t.string "name", limit: 255 + t.string "slug", limit: 255 + t.string "info", limit: 255 t.datetime "created_at" t.datetime "updated_at" t.integer "order" end create_table "workshops", force: :cascade do |t| - t.string "title" - t.string "slug" + t.string "title", limit: 255 + t.string "slug", limit: 255 t.text "info" t.integer "conference_id" t.integer "workshop_stream_id"