aboutsummaryrefslogtreecommitdiffstats
path: root/guides/code/getting_started
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-04-25 18:33:36 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-04-25 18:33:36 +0530
commit4a3ce153f1e05c9c590e9ee74e818649336d929f (patch)
tree8552fc2e59d0217c43dba6cb376b111799ac2fa3 /guides/code/getting_started
parentbb0906e2d7c283bccae3d903e9b19a83ca297811 (diff)
parent8189536aeb91394ccc649b9c14f0cf15c25b9423 (diff)
downloadrails-4a3ce153f1e05c9c590e9ee74e818649336d929f.tar.gz
rails-4a3ce153f1e05c9c590e9ee74e818649336d929f.tar.bz2
rails-4a3ce153f1e05c9c590e9ee74e818649336d929f.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'guides/code/getting_started')
-rw-r--r--guides/code/getting_started/app/controllers/posts_controller.rb14
-rw-r--r--guides/code/getting_started/app/helpers/welcome_helper.rb (renamed from guides/code/getting_started/app/helpers/home_helper.rb)0
-rw-r--r--guides/code/getting_started/app/views/posts/_form.html.erb2
-rw-r--r--guides/code/getting_started/app/views/posts/edit.html.erb3
-rw-r--r--guides/code/getting_started/app/views/posts/index.html.erb2
-rw-r--r--guides/code/getting_started/app/views/posts/show.html.erb1
-rw-r--r--guides/code/getting_started/config/routes.rb2
7 files changed, 21 insertions, 3 deletions
diff --git a/guides/code/getting_started/app/controllers/posts_controller.rb b/guides/code/getting_started/app/controllers/posts_controller.rb
index 947cd2a767..fc71e9b4e8 100644
--- a/guides/code/getting_started/app/controllers/posts_controller.rb
+++ b/guides/code/getting_started/app/controllers/posts_controller.rb
@@ -21,4 +21,18 @@ class PostsController < ApplicationController
render 'new'
end
end
+
+ def edit
+ @post = Post.find(params[:id])
+ end
+
+ def update
+ @post = Post.find(params[:id])
+
+ if @post.update_attributes(params[:post])
+ redirect_to :action => :show, :id => @post.id
+ else
+ render 'edit'
+ end
+ end
end
diff --git a/guides/code/getting_started/app/helpers/home_helper.rb b/guides/code/getting_started/app/helpers/welcome_helper.rb
index eeead45fc9..eeead45fc9 100644
--- a/guides/code/getting_started/app/helpers/home_helper.rb
+++ b/guides/code/getting_started/app/helpers/welcome_helper.rb
diff --git a/guides/code/getting_started/app/views/posts/_form.html.erb b/guides/code/getting_started/app/views/posts/_form.html.erb
index 18cb29f335..46ec257b91 100644
--- a/guides/code/getting_started/app/views/posts/_form.html.erb
+++ b/guides/code/getting_started/app/views/posts/_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_for :post, :url => { :action => :create } do |f| %>
+<%= form_for :post, :url => { :action => :update, :id => @post.id }, :method => :put do |f| %>
<% if @post.errors.any? %>
<div id="errorExplanation">
<h2><%= pluralize(@post.errors.count, "error") %> prohibited this post from being saved:</h2>
diff --git a/guides/code/getting_started/app/views/posts/edit.html.erb b/guides/code/getting_started/app/views/posts/edit.html.erb
index 720580236b..911a48569d 100644
--- a/guides/code/getting_started/app/views/posts/edit.html.erb
+++ b/guides/code/getting_started/app/views/posts/edit.html.erb
@@ -2,5 +2,4 @@
<%= render 'form' %>
-<%= link_to 'Show', @post %> |
-<%= link_to 'Back', posts_path %>
+<%= link_to 'Back', :action => :index %>
diff --git a/guides/code/getting_started/app/views/posts/index.html.erb b/guides/code/getting_started/app/views/posts/index.html.erb
index 455a74b17f..3ba7091c15 100644
--- a/guides/code/getting_started/app/views/posts/index.html.erb
+++ b/guides/code/getting_started/app/views/posts/index.html.erb
@@ -7,6 +7,7 @@
<th>Title</th>
<th>Text</th>
<th></th>
+ <th></th>
</tr>
<% @posts.each do |post| %>
@@ -14,6 +15,7 @@
<td><%= post.title %></td>
<td><%= post.text %></td>
<td><%= link_to 'Show', :action => :show, :id => post.id %>
+ <td><%= link_to 'Edit', :action => :edit, :id => post.id %>
</tr>
<% end %>
</table>
diff --git a/guides/code/getting_started/app/views/posts/show.html.erb b/guides/code/getting_started/app/views/posts/show.html.erb
index a79fadfe4c..aea28cd5a2 100644
--- a/guides/code/getting_started/app/views/posts/show.html.erb
+++ b/guides/code/getting_started/app/views/posts/show.html.erb
@@ -9,3 +9,4 @@
</p>
<%= link_to 'Back', :action => :index %>
+| <%= link_to 'Edit', :action => :edit, :id => @post.id %>
diff --git a/guides/code/getting_started/config/routes.rb b/guides/code/getting_started/config/routes.rb
index 10009a35cf..b0973c62d5 100644
--- a/guides/code/getting_started/config/routes.rb
+++ b/guides/code/getting_started/config/routes.rb
@@ -7,6 +7,8 @@ Blog::Application.routes.draw do
get "posts/new"
post "posts/create"
get "posts/:id" => "posts#show"
+ get "posts/:id/edit" => "posts#edit"
+ put "posts/:id/update" => "posts#update"
# The priority is based upon order of creation:
# first created -> highest priority.