heroku

bay6 · Aug 6, 2013 · 050c815 · 050c815 · hlee · Aug 10, 2013
1 parent 8f66f42
commit 050c815
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/danny/microblog_app/Gemfile b/danny/microblog_app/Gemfile
@@ -1,6 +1,6 @@
 
-source 'http://ruby.taobao.org'
-# source 'https://rubygems.org'
+# source 'http://ruby.taobao.org'
+source 'https://rubygems.org'
 
 ruby '2.0.0'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'

diff --git a/danny/microblog_app/README.md b/danny/microblog_app/README.md
@@ -1,3 +1,3 @@
-#Ruby on Rails Tutorial: Microblog application
+#Ruby on Rails Tutorial
 
-##chapter 3
+http://safe-plateau-5354.herokuapp.com
diff --git a/danny/microblog_app/app/views/users/follow_all.js.erb b/danny/microblog_app/app/views/users/follow_all.js.erb
@@ -1,2 +0,0 @@
-$("#follow_form").html("<%= escape_javascript(render('users/unfollow')) %>")
-$("#fans").html('<%= @user.fans.count %>')

diff --git a/danny/microblog_app/app/views/users/show_follow.html.erb b/danny/microblog_app/app/views/users/show_follow.html.erb
@@ -23,7 +23,7 @@
 			<h3><%= @title %></h3>
 		</div>
 		<% if @users.any? %>
-			<%= render 'show_follow_all' %>
+			<%= render 'show_follow_all' if @title =="Fans" || !current_user? @user %>
 			<ul class="users">
 					<%= render @users %>
 			</ul>
Original file line number	Diff line number	Diff line change
		@@ -1,2 +0,0 @@
		$("#follow_form").html("<%= escape_javascript(render('users/unfollow')) %>")
		$("#fans").html('<%= @user.fans.count %>')