#56 finished coding

gonfreecs · Apr 6, 2015 · 31a0807 · 31a0807
1 parent dcf1fc6
commit 31a0807
Show file tree

Hide file tree

Showing 4 changed files with 2,205 additions and 3 deletions.
diff --git a/app/controllers/magazines_controller.rb b/app/controllers/magazines_controller.rb
@@ -21,6 +21,8 @@ def index
   # GET /magazines/1
   # GET /magazines/1.json
   def show
+    @join = Requestjoiningmagazine
+    .where('user_id = ? AND magazine_id = ?', current_user.id, params[:id])
   end
 
   # GET /magazines/new
@@ -84,7 +86,6 @@ def check_for_cancel
   def join
     joinh = { "user_id" => current_user.id, "magazine_id" => params[:id] }
     Requestjoiningmagazine.create(joinh)
-    flash[:notice] = "A joining request has been sent."
     @magazine = Magazine.find(params[:id])
     redirect_to @magazine
   end

diff --git a/app/views/magazines/show.html.erb b/app/views/magazines/show.html.erb
@@ -1,5 +1,6 @@
-<p id="notice"><%= notice %></p>
-<%= flash[:notice]%>
+<% if @join.present? %>
+<%= flash[:notice] = "You have requested joining this magazine." %>
+<% end %>
 <p>
   <strong>Name:</strong>
   <%= @magazine.name %>

diff --git a/db/development.sqlite3 b/db/development.sqlite3