Browse Source

lk | renames columns on agencies table

master
Louis Knapp 8 years ago
parent
commit
7cd1b7a7a4
  1. 6
      app/controllers/agencies_controller.rb
  2. 16
      app/views/agencies/_fields.html.haml
  3. 6
      app/views/agencies/_form.html.haml
  4. 4
      app/views/agencies/edit.html.haml
  5. 4
      app/views/agencies/index.html.haml
  6. 6
      db/migrate/20160724130507_change_agency_phone_number_to_agency_phone.rb
  7. 6
      db/schema.rb

6
app/controllers/agencies_controller.rb

@ -45,13 +45,13 @@ class AgenciesController < ApplicationController
def agency_params def agency_params
params.require(:agency).permit( params.require(:agency).permit(
:agency_name, :name,
:contact_name, :contact_name,
:street_address, :street_address,
:city, :city,
:state, :state,
:postal_code, :postal_code,
:phone_number, :phone,
:email) :email)
end end
end end

16
app/views/agencies/_fields.html.haml

@ -1,12 +1,12 @@
- disabled ||= false - disabled ||= false
.form-horizontal .form-horizontal
.form-group .form-group
= f.label "Name of Agency:", class: "col-sm-2 control-label" = f.label "Name of Agency:", class: "col-sm-2 control-label"
.col-sm-10 .col-sm-10
= f.text_field :agency_name, class: "form-control", disabled: disabled = f.text_field :name, class: "form-control", disabled: disabled
.form-group .form-group
= f.label "Contact Name:", class: "col-sm-2 control-label" = f.label "Contact Name:", class: "col-sm-2 control-label"
.col-sm-10 .col-sm-10
= f.text_field :contact_name, class: "form-control", disabled: disabled = f.text_field :contact_name, class: "form-control", disabled: disabled
@ -14,7 +14,7 @@
= f.label "Street Address:", class: "col-sm-2 control-label" = f.label "Street Address:", class: "col-sm-2 control-label"
.col-sm-10 .col-sm-10
= f.text_field :street_address, class: "form-control", disabled: disabled = f.text_field :street_address, class: "form-control", disabled: disabled
.form-group .form-group
= f.label "City:", class: "col-sm-2 control-label" = f.label "City:", class: "col-sm-2 control-label"
.col-sm-10 .col-sm-10
@ -24,16 +24,16 @@
= f.label "State:", class: "col-sm-2 control-label" = f.label "State:", class: "col-sm-2 control-label"
.col-sm-10 .col-sm-10
= f.text_field :state, class: "form-control", disabled: disabled = f.text_field :state, class: "form-control", disabled: disabled
.form-group .form-group
= f.label "Postal Code:", class: "col-sm-2 control-label" = f.label "Postal Code:", class: "col-sm-2 control-label"
.col-sm-10 .col-sm-10
= f.text_field :postal_code, class: "form-control", disabled: disabled = f.text_field :postal_code, class: "form-control", disabled: disabled
.form-group .form-group
= f.label "Phone Number", class: "col-sm-2 control-label" = f.label "Phone Number", class: "col-sm-2 control-label"
.col-sm-10 .col-sm-10
= f.text_field :phone_number, class: "form-control", disabled: disabled = f.text_field :phone, class: "form-control", disabled: disabled
.form-group .form-group
= f.label "email", class: "col-sm-2 control-label" = f.label "email", class: "col-sm-2 control-label"

6
app/views/agencies/_form.html.haml

@ -1,11 +1,11 @@
= form_for @agency, html: {class: 'form-horizontal'} do |f| = form_for @agency, html: {class: 'form-horizontal'} do |f|
- if @agency.errors.any? - if @agency.errors.any?
#error_explanation #error_explanation
%h2= pluralize(@agency.errors.count, "error") + " prohibited this agency from being saved:" %h2= pluralize(@agency.errors.count, "error") + " prohibited this agency from being saved:"
%ul %ul
- @agency.errors.full_messages.each do |msg| - @agency.errors.full_messages.each do |msg|
%li= msg %li= msg
= render 'fields', f: f = render 'fields', f: f
.row .row
.actions.col-sm-offset-2 .actions.col-sm-offset-2
= f.submit class: "btn btn-default" = f.submit class: "btn btn-default"

4
app/views/agencies/edit.html.haml

@ -1,6 +1,6 @@
.container .container
%h1 Edit Agency %h1 Edit Agency
= render 'form' = render 'form'
= link_to 'Show', @agency = link_to 'Show', @agency
| |
= link_to 'Back', agencies_path = link_to 'Back', agencies_path

4
app/views/agencies/index.html.haml

@ -11,10 +11,10 @@
%tbody %tbody
- @agencies.each do |agency| - @agencies.each do |agency|
%tr %tr
%td= agency.agency_name %td= agency.name
%td= link_to 'Show', agency %td= link_to 'Show', agency
%td= link_to 'Edit', edit_agency_path(agency) %td= link_to 'Edit', edit_agency_path(agency)
%td= link_to 'Destroy', agency, method: :delete, data: { confirm: 'Are you sure?' } %td= link_to 'Destroy', agency, method: :delete, data: { confirm: 'Are you sure?' }
%br %br
= link_to ' + New Agency', new_agency_path, class: "btn btn-default" = link_to ' + New Agency', new_agency_path, class: "btn btn-default"

6
db/migrate/20160724130507_change_agency_phone_number_to_agency_phone.rb

@ -0,0 +1,6 @@
class ChangeAgencyPhoneNumberToAgencyPhone < ActiveRecord::Migration
def change
rename_column :agencies, :phone_number, :phone
rename_column :agencies, :agency_name, :name
end
end

6
db/schema.rb

@ -11,19 +11,19 @@
# #
# 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: 20160717165815) do ActiveRecord::Schema.define(version: 20160724130507) 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 "agencies", force: :cascade do |t| create_table "agencies", force: :cascade do |t|
t.string "agency_name" t.string "name"
t.string "contact_name" t.string "contact_name"
t.string "street_address" t.string "street_address"
t.string "city" t.string "city"
t.string "state" t.string "state"
t.string "postal_code" t.string "postal_code"
t.string "phone_number" t.string "phone"
t.string "email" t.string "email"
end end

Loading…
Cancel
Save