bike
/
BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity
Browse Source

Fixed a problem preventing login

development
G0dwin 11 years ago
parent
ffa8239e42
commit
e5bf3f5a5c
4 changed files with 289 additions and 295 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      Gemfile.lock
  2. 5
      app/helpers/bike_bike_form_helper.rb
  3. 6
      app/views/users/_form.html.haml
  4. 564
      db/schema.rb

9
Gemfile.lock
View File

@ -12,11 +12,6 @@ GIT
i18n-active_record (0.0.2) i18n-active_record (0.0.2)
i18n (>= 0.5.0) i18n (>= 0.5.0)
PATH
remote: ../carmen/
specs:
carmen (1.0.1)
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
@ -71,6 +66,8 @@ GEM
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
xpath (~> 2.0) xpath (~> 2.0)
carmen (1.0.1)
unicode_utils (~> 1.4.0)
carmen-rails (1.0.1) carmen-rails (1.0.1)
carmen (~> 1.0.0) carmen (~> 1.0.0)
rails rails
@ -338,6 +335,7 @@ GEM
uglifier (2.5.0) uglifier (2.5.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
json (>= 1.8.0) json (>= 1.8.0)
unicode_utils (1.4.0)
uniform_notifier (1.4.0) uniform_notifier (1.4.0)
wdm (0.1.0) wdm (0.1.0)
webmock (1.17.4) webmock (1.17.4)
@ -359,7 +357,6 @@ DEPENDENCIES
binding_of_caller binding_of_caller
bullet bullet
capybara capybara
carmen!
carmen-rails carmen-rails
carrierwave carrierwave
carrierwave-imageoptimizer carrierwave-imageoptimizer

5
app/helpers/bike_bike_form_helper.rb
View File

@ -194,17 +194,14 @@ module BikeBikeFormHelper
render_field(method, options = get_options(method, options), super(object_name, method, options), get_value(method, options)) render_field(method, options = get_options(method, options), super(object_name, method, options), get_value(method, options))
end end
#def fields_for
def form_for(*args, &block) def form_for(*args, &block)
@record = args.first @record = args.first
template = 'errors_' + @record.class.name.underscore template = 'errors_' + @record.class.name.underscore
template = 'errors_default' unless lookup_context.exists?(template, [TEMPLATE_DIR], true) template = 'errors_default' unless lookup_context.exists?(template, [TEMPLATE_DIR], true)
( render (TEMPLATE_DIR + '/' + template) ) + super(args, &block) ( render (TEMPLATE_DIR + '/' + template) ) + super(*args, &block)
end end
#def label
def collection_check_boxes(object, method, collection, value_method, text_method, options = {}, html_options = {}, &block) def collection_check_boxes(object, method, collection, value_method, text_method, options = {}, html_options = {}, &block)
render_field(method, options = get_options(method, options), super(object, method, collection, value_method, text_method, options, html_options, &block), get_value(method, options)) render_field(method, options = get_options(method, options), super(object, method, collection, value_method, text_method, options, html_options, &block), get_value(method, options))

6
app/views/users/_form.html.haml
View File

@ -1,10 +1,10 @@
= form_for @user, :html => (@user.id ? {:multipart => true} : {}) do |f| = form_for @user, :html => (@user && @user.id ? {:multipart => true} : {}) do |f|
%div{:class => (@user.id ? 'columns medium-6' : '')} %div{:class => (@user.id ? 'columns medium-6' : '')}
= f.text_field :username = f.text_field :username
= f.email_field :email = f.email_field :email
- if !@user.id - if !@user.id
= f.password_field, :password = f.password_field :password
= f.password_field, :password_confirmation = f.password_field :password_confirmation
= f.actions :register = f.actions :register
- if @user.id - if @user.id
.columns.medium-6 .columns.medium-6

564
db/schema.rb
View File

@ -1,282 +1,282 @@
# encoding: UTF-8 # encoding: UTF-8
# This file is auto-generated from the current state of the database. Instead # This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to # of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition. # incrementally modify your database, and then regenerate this schema definition.
# #
# Note that this schema.rb definition is the authoritative source for your # Note that this schema.rb definition is the authoritative source for your
# database schema. If you need to create the application database on another # database schema. If you need to create the application database on another
# system, you should be using db:schema:load, not running all the migrations # system, you should be using db:schema:load, not running all the migrations
# from scratch. The latter is a flawed and unsustainable approach (the more migrations # from scratch. The latter is a flawed and unsustainable approach (the more migrations
# you'll amass, the slower it'll run and the greater likelihood for issues). # you'll amass, the slower it'll run and the greater likelihood for issues).
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20140315183241) do ActiveRecord::Schema.define(version: 20140315183241) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
create_table "authentications", force: true do |t| create_table "authentications", force: true do |t|
t.integer "user_id", null: false t.integer "user_id", null: false
t.string "provider", null: false t.string "provider", null: false
t.string "uid", null: false t.string "uid", null: false
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "conference_admins", force: true do |t| create_table "conference_admins", force: true do |t|
t.integer "conference_id" t.integer "conference_id"
t.integer "user_id" t.integer "user_id"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "conference_host_organizations", force: true do |t| create_table "conference_host_organizations", force: true do |t|
t.integer "conference_id" t.integer "conference_id"
t.integer "organization_id" t.integer "organization_id"
t.integer "order" t.integer "order"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "conference_registration_form_fields", force: true do |t| create_table "conference_registration_form_fields", force: true do |t|
t.integer "conference_id" t.integer "conference_id"
t.integer "registration_form_field_id" t.integer "registration_form_field_id"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.integer "position" t.integer "position"
end end
create_table "conference_registration_responses", force: true do |t| create_table "conference_registration_responses", force: true do |t|
t.integer "conference_registration_id" t.integer "conference_registration_id"
t.integer "registration_form_field_id" t.integer "registration_form_field_id"
t.text "data" t.text "data"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "conference_registrations", force: true do |t| create_table "conference_registrations", force: true do |t|
t.integer "conference_id" t.integer "conference_id"
t.integer "user_id" t.integer "user_id"
t.string "is_attending" t.string "is_attending"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "conference_types", force: true do |t| create_table "conference_types", force: true do |t|
t.string "title" t.string "title"
t.string "info" t.string "info"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.string "slug" t.string "slug"
end end
create_table "conferences", force: true do |t| create_table "conferences", force: true do |t|
t.string "title" t.string "title"
t.string "slug" t.string "slug"
t.datetime "start_date" t.datetime "start_date"
t.datetime "end_date" t.datetime "end_date"
t.text "info" t.text "info"
t.string "poster" t.string "poster"
t.string "cover" t.string "cover"
t.boolean "workshop_schedule_published" t.boolean "workshop_schedule_published"
t.boolean "registration_open" t.boolean "registration_open"
t.boolean "meals_provided" t.boolean "meals_provided"
t.text "meal_info" t.text "meal_info"
t.text "travel_info" t.text "travel_info"
t.integer "conference_type_id" t.integer "conference_type_id"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.text "preregistration_info" t.text "preregistration_info"
t.text "registration_info" t.text "registration_info"
t.text "postregistration_info" t.text "postregistration_info"
end end
create_table "event_types", force: true do |t| create_table "event_types", force: true do |t|
t.string "slug" t.string "slug"
t.text "info" t.text "info"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "events", force: true do |t| create_table "events", force: true do |t|
t.string "title" t.string "title"
t.string "slug" t.string "slug"
t.integer "event_type_id" t.integer "event_type_id"
t.integer "conference_id" t.integer "conference_id"
t.text "info" t.text "info"
t.integer "location_id" t.integer "location_id"
t.datetime "start_time" t.datetime "start_time"
t.datetime "end_time" t.datetime "end_time"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "locations", force: true do |t| create_table "locations", force: true do |t|
t.string "title" t.string "title"
t.float "latitude" t.float "latitude"
t.float "longitude" t.float "longitude"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.string "country" t.string "country"
t.string "territory" t.string "territory"
t.string "city" t.string "city"
t.string "street" t.string "street"
t.string "postal_code" t.string "postal_code"
end end
add_index "locations", ["latitude", "longitude"], name: "index_locations_on_latitude_and_longitude", using: :btree add_index "locations", ["latitude", "longitude"], name: "index_locations_on_latitude_and_longitude", using: :btree
create_table "locations_organizations", id: false, force: true do |t| create_table "locations_organizations", id: false, force: true do |t|
t.integer "organization_id" t.integer "organization_id"
t.integer "location_id" t.integer "location_id"
end end
add_index "locations_organizations", ["organization_id", "location_id"], name: "loc_org_index", using: :btree add_index "locations_organizations", ["organization_id", "location_id"], name: "loc_org_index", using: :btree
create_table "organization_statuses", force: true do |t| create_table "organization_statuses", force: true do |t|
t.string "name" t.string "name"
t.string "slug" t.string "slug"
t.string "info" t.string "info"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "organizations", force: true do |t| create_table "organizations", force: true do |t|
t.string "name" t.string "name"
t.string "slug" t.string "slug"
t.string "email_address" t.string "email_address"
t.string "url" t.string "url"
t.integer "year_founded" t.integer "year_founded"
t.text "info" t.text "info"
t.string "logo" t.string "logo"
t.string "avatar" t.string "avatar"
t.boolean "requires_approval" t.boolean "requires_approval"
t.string "secret_question" t.string "secret_question"
t.string "secret_answer" t.string "secret_answer"
t.integer "user_organization_replationship_id" t.integer "user_organization_replationship_id"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.string "cover" t.string "cover"
end end
create_table "registration_form_fields", force: true do |t| create_table "registration_form_fields", force: true do |t|
t.string "title" t.string "title"
t.text "help" t.text "help"
t.boolean "required" t.boolean "required"
t.string "field_type" t.string "field_type"
t.string "options" t.string "options"
t.boolean "is_retired" t.boolean "is_retired"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "translations", force: true do |t| create_table "translations", force: true do |t|
t.string "locale" t.string "locale"
t.string "key" t.string "key"
t.text "value" t.text "value"
t.text "interpolations" t.text "interpolations"
t.boolean "is_proc", default: false t.boolean "is_proc", default: false
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "user_organization_relationships", force: true do |t| create_table "user_organization_relationships", force: true do |t|
t.integer "user_id", null: false t.integer "user_id"
t.integer "organization_id", null: false t.integer "organization_id"
t.string "relationship" t.string "relationship"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "users", force: true do |t| create_table "users", force: true do |t|
t.string "username", null: false t.string "username", null: false
t.string "email" t.string "email"
t.string "crypted_password" t.string "crypted_password"
t.string "salt" t.string "salt"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.string "remember_me_token" t.string "remember_me_token"
t.datetime "remember_me_token_expires_at" t.datetime "remember_me_token_expires_at"
t.string "reset_password_token" t.string "reset_password_token"
t.datetime "reset_password_token_expires_at" t.datetime "reset_password_token_expires_at"
t.datetime "reset_password_email_sent_at" t.datetime "reset_password_email_sent_at"
t.string "activation_state" t.string "activation_state"
t.string "activation_token" t.string "activation_token"
t.datetime "activation_token_expires_at" 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.datetime "lock_expires_at"
t.string "unlock_token" t.string "unlock_token"
t.string "avatar" t.string "avatar"
end end
add_index "users", ["activation_token"], name: "index_users_on_activation_token", using: :btree add_index "users", ["activation_token"], name: "index_users_on_activation_token", using: :btree
add_index "users", ["remember_me_token"], name: "index_users_on_remember_me_token", using: :btree add_index "users", ["remember_me_token"], name: "index_users_on_remember_me_token", using: :btree
add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", using: :btree add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", using: :btree
create_table "versions", force: true do |t| create_table "versions", force: true do |t|
t.string "item_type" t.string "item_type"
t.integer "item_id" t.integer "item_id"
t.string "event" t.string "event"
t.string "whodunnit" t.string "whodunnit"
t.text "object" t.text "object"
t.datetime "created_at" t.datetime "created_at"
t.text "value" t.string "value"
end end
create_table "workshop_facilitators", force: true do |t| create_table "workshop_facilitators", force: true do |t|
t.integer "user_id" t.integer "user_id"
t.integer "workshop_id" t.integer "workshop_id"
t.string "role" t.string "role"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "workshop_presentation_styles", force: true do |t| create_table "workshop_presentation_styles", force: true do |t|
t.string "name" t.string "name"
t.string "slug" t.string "slug"
t.string "info" t.string "info"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "workshop_requested_resources", force: true do |t| create_table "workshop_requested_resources", force: true do |t|
t.integer "workshop_id" t.integer "workshop_id"
t.integer "workshop_resource_id" t.integer "workshop_resource_id"
t.string "status" t.string "status"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "workshop_resources", force: true do |t| create_table "workshop_resources", force: true do |t|
t.string "name" t.string "name"
t.string "slug" t.string "slug"
t.string "info" t.string "info"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "workshop_streams", force: true do |t| create_table "workshop_streams", force: true do |t|
t.string "name" t.string "name"
t.string "slug" t.string "slug"
t.string "info" t.string "info"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "workshops", force: true do |t| create_table "workshops", force: true do |t|
t.string "title" t.string "title"
t.string "slug" t.string "slug"
t.text "info" t.text "info"
t.integer "conference_id" t.integer "conference_id"
t.integer "workshop_stream_id" t.integer "workshop_stream_id"
t.integer "workshop_presentation_style" t.integer "workshop_presentation_style"
t.integer "min_facilitators" t.integer "min_facilitators"
t.integer "location_id" t.integer "location_id"
t.datetime "start_time" t.datetime "start_time"
t.datetime "end_time" t.datetime "end_time"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
end end

Write Preview
Loading…
Cancel
Save