From 4a7e76576f0d43cd8a155260ad5873381a9ae85c Mon Sep 17 00:00:00 2001 From: Rania Abdel Fattah Date: Mon, 12 May 2014 14:50:53 +0200 Subject: [PATCH] #470 commiting for Rspec session --- tutor/app/controllers/students_controller.rb | 2 ++ tutor/app/views/students/_show.html.erb | 22 +++++++++---------- tutor/db/development.sqlite3 | Bin 282624 -> 282624 bytes 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tutor/app/controllers/students_controller.rb b/tutor/app/controllers/students_controller.rb index 9c802065..6006647f 100644 --- a/tutor/app/controllers/students_controller.rb +++ b/tutor/app/controllers/students_controller.rb @@ -10,4 +10,6 @@ def show @student = Student.find(params[:id]) @courses = @student.courses.order("created_at desc") end + + end diff --git a/tutor/app/views/students/_show.html.erb b/tutor/app/views/students/_show.html.erb index 11b3e953..6d89c73f 100644 --- a/tutor/app/views/students/_show.html.erb +++ b/tutor/app/views/students/_show.html.erb @@ -38,17 +38,17 @@

Continue from where you left off


-
-

<%= @post.owner.name %>

-
-
-

<%= @post.content %>

-

<%= distance_of_time_in_words_to_now @post. - created_at %> ago

-
-
-
-

+
+ +

+ <%= @reply.content %> +
+

+

<%= distance_of_time_in_words_to_now reply.created_at %> ago

+
+
+ +

Your Progress

diff --git a/tutor/db/development.sqlite3 b/tutor/db/development.sqlite3 index 379fe0558160ebe838c2c03bfafc7033d68e1e8e..02d5c9c5d4df22d906a647d6695c69d1498b6c05 100644 GIT binary patch delta 8103 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 z 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