From cd1fabe40ca4d290df33a2590f3a1f2072103972 Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Thu, 20 Feb 2014 17:13:51 -0500 Subject: fix datatype names in generate.sh --- app/views/alerts/_form.html.erb | 4 ++-- app/views/alerts/index.json.jbuilder | 2 +- app/views/alerts/show.json.jbuilder | 2 +- app/views/matches/_form.html.erb | 4 ++-- app/views/matches/index.json.jbuilder | 2 +- app/views/matches/show.json.jbuilder | 2 +- app/views/pms/_form.html.erb | 8 ++++---- app/views/pms/index.json.jbuilder | 2 +- app/views/pms/show.json.jbuilder | 2 +- app/views/users/_form.html.erb | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) (limited to 'app/views') diff --git a/app/views/alerts/_form.html.erb b/app/views/alerts/_form.html.erb index f0da996..b60eaf2 100644 --- a/app/views/alerts/_form.html.erb +++ b/app/views/alerts/_form.html.erb @@ -12,8 +12,8 @@ <% end %>
- <%= f.label :author %>
- <%= f.text_field :author %> + <%= f.label :author_id %>
+ <%= f.text_field :author_id %>
<%= f.label :message %>
diff --git a/app/views/alerts/index.json.jbuilder b/app/views/alerts/index.json.jbuilder index 685157e..0911a5c 100644 --- a/app/views/alerts/index.json.jbuilder +++ b/app/views/alerts/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@alerts) do |alert| - json.extract! alert, :id, :author, :message + json.extract! alert, :id, :author_id, :message json.url alert_url(alert, format: :json) end diff --git a/app/views/alerts/show.json.jbuilder b/app/views/alerts/show.json.jbuilder index 83fe24a..95481eb 100644 --- a/app/views/alerts/show.json.jbuilder +++ b/app/views/alerts/show.json.jbuilder @@ -1 +1 @@ -json.extract! @alert, :id, :author, :message, :created_at, :updated_at +json.extract! @alert, :id, :author_id, :message, :created_at, :updated_at diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb index 7d0a371..34494c3 100644 --- a/app/views/matches/_form.html.erb +++ b/app/views/matches/_form.html.erb @@ -12,8 +12,8 @@ <% end %>
- <%= f.label :tournament %>
- <%= f.text_field :tournament %> + <%= f.label :tournament_id %>
+ <%= f.text_field :tournament_id %>
<%= f.submit %> diff --git a/app/views/matches/index.json.jbuilder b/app/views/matches/index.json.jbuilder index 0839c83..c8ada7a 100644 --- a/app/views/matches/index.json.jbuilder +++ b/app/views/matches/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@matches) do |match| - json.extract! match, :id, :tournament + json.extract! match, :id, :tournament_id json.url match_url(match, format: :json) end diff --git a/app/views/matches/show.json.jbuilder b/app/views/matches/show.json.jbuilder index a381f65..2e45395 100644 --- a/app/views/matches/show.json.jbuilder +++ b/app/views/matches/show.json.jbuilder @@ -1 +1 @@ -json.extract! @match, :id, :tournament, :created_at, :updated_at +json.extract! @match, :id, :tournament_id, :created_at, :updated_at diff --git a/app/views/pms/_form.html.erb b/app/views/pms/_form.html.erb index bbc6aee..480e308 100644 --- a/app/views/pms/_form.html.erb +++ b/app/views/pms/_form.html.erb @@ -12,12 +12,12 @@ <% end %>
- <%= f.label :author %>
- <%= f.text_field :author %> + <%= f.label :author_id %>
+ <%= f.text_field :author_id %>
- <%= f.label :recipient %>
- <%= f.text_field :recipient %> + <%= f.label :recipient_id %>
+ <%= f.text_field :recipient_id %>
<%= f.label :message %>
diff --git a/app/views/pms/index.json.jbuilder b/app/views/pms/index.json.jbuilder index aebdc08..fcfca84 100644 --- a/app/views/pms/index.json.jbuilder +++ b/app/views/pms/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@pms) do |pm| - json.extract! pm, :id, :author, :recipient, :message + json.extract! pm, :id, :author_id, :recipient_id, :message json.url pm_url(pm, format: :json) end diff --git a/app/views/pms/show.json.jbuilder b/app/views/pms/show.json.jbuilder index 651e78f..94252e9 100644 --- a/app/views/pms/show.json.jbuilder +++ b/app/views/pms/show.json.jbuilder @@ -1 +1 @@ -json.extract! @pm, :id, :author, :recipient, :message, :created_at, :updated_at +json.extract! @pm, :id, :author_id, :recipient_id, :message, :created_at, :updated_at diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb index a7ead1b..2d1ad24 100644 --- a/app/views/users/_form.html.erb +++ b/app/views/users/_form.html.erb @@ -17,11 +17,11 @@
<%= f.label :pw_hash %>
- <%= f.text_field :pw_hash %> + <%= f.text_area :pw_hash %>
<%= f.label :groups %>
- <%= f.text_field :groups %> + <%= f.number_field :groups %>
<%= f.submit %> -- cgit v1.2.3-54-g00ecf