From 51249e26f31bd130b4522d793a664a9470676d6e Mon Sep 17 00:00:00 2001
From: baiyu <123@123.com>
Date: Mon, 12 Aug 2013 23:06:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dtag=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/tags_controller.rb                 | 6 +++++-
 app/views/issues/_list.html.erb                    | 3 +--
 app/views/issues/show.html.erb                     | 5 ++---
 app/views/layouts/base_projects.html.erb           | 6 +++---
 app/views/tags/add_tag.js.erb                      | 2 +-
 app/views/tags/delete_tag.js.erb                   | 2 +-
 app/views/tags/index.html.erb                      | 2 +-
 db/migrate/20130807031901_add_user_id_to_shares.rb | 5 +++++
 8 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 db/migrate/20130807031901_add_user_id_to_shares.rb

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 229fc67ab..1d193ef42 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -24,13 +24,17 @@ class TagsController < ApplicationController
     @users_results = get_users_by_tag($selected_tags)
 
     @obj_id = params[:obj_id]
-    case params[:object_flag]
+    @obj_flag = params[:object_flag]
+
+    case @obj_flag
     when '1' then
       @obj = User.find_by_id(@obj_id)
     when '2' then
       @obj = Project.find_by_id(@obj_id)
     when '3' then
       @obj = Issue.find_by_id(@obj_id)
+    when '4'
+      @obj = Bid.find_by_id(@obj_id)
     else
     @obj = nil
     end
diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 53a6681db..9b1a5cf67 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -73,8 +73,7 @@
 			<li id="issue-<%= issue.id %>" class="hascontextmenu-1  <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
 				<% column_content =  ( query.inline_columns.map {|column| "#{column_content_new(column, issue)}"}) %>
 
-				<%= render :partial => "/praise_tread/praise_tread",
-				:locals => {:obj => issue,:user_id =>User.current.id}%>
+				<!-- 在这里添加赞和踩-->
 
 				<% if issue.tracker.name == 'Bug' %>
 				<%= image_tag("/images/task.png", :class => "img-tag-issues") %>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index e03587c5b..2b41343af 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -27,9 +27,8 @@
 <%= render_issue_subject_with_tree(@issue) %>
 </div> 
 
-<!-- 顶和踩 -->
-<%= render :partial => "/praise_tread/praise_tread",
-	          :locals => {:obj => @issue,:user_id =>User.current.id}%> 
+<!-- 顶和踩  在这里添加  -->
+
 	          
         <p class="author">
         <%= authoring @issue.created_on, @issue.author %>.
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 849e7a3bc..0fd071b3d 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -35,9 +35,9 @@
 											<div class="info_font">
 												<%= textilizable @project.name %>
 											</div>
-											<div>
-												<% if @project.watched_by?(User.current) %>
-												<%= watcher_link(@project, User.current) %>
+											<div>				
+												<% unless User.current.member_of? @project %>
+												   <%= watcher_link(@project, User.current) %>
 												<% end %>
 											</div></td>
 										</tr>
diff --git a/app/views/tags/add_tag.js.erb b/app/views/tags/add_tag.js.erb
index 610fb12c3..6c623ddd9 100644
--- a/app/views/tags/add_tag.js.erb
+++ b/app/views/tags/add_tag.js.erb
@@ -4,6 +4,6 @@ $('#related_tags').html('<%= j(render :partial => "related_tags",
   :locals => {:related_tags => $related_tags })%>')
 
 $('#show_results').html('<%= j(render :partial => "tag_search_results",:locals => {:issues_results => @issues_results,
-    	 	:projects_results => @projects_results,:users_results => @users_results })%>')
+    	 	:projects_results => @projects_results,:users_results => @users_results,:show_flag => @show_flag })%>')
   
   
\ No newline at end of file
diff --git a/app/views/tags/delete_tag.js.erb b/app/views/tags/delete_tag.js.erb
index ca714ccfa..808eb5388 100644
--- a/app/views/tags/delete_tag.js.erb
+++ b/app/views/tags/delete_tag.js.erb
@@ -4,5 +4,5 @@ $('#related_tags').html('<%= j(render :partial => "related_tags",
 :locals => {:related_tags => $related_tags })%>')
 
 $('#show_results').html('<%= j(render :partial => "tag_search_results",:locals => {:issues_results => @issues_results,
-:projects_results => @projects_results,:users_results => @users_results })%>')
+:projects_results => @projects_results,:users_results => @users_results,:show_flag => @show_flag })%>')
 
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index 7b4890830..f8d6c40b1 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -24,7 +24,7 @@
 	</div>
     <div id="show_results">
     	 <%= render :partial => "tag_search_results",:locals => {:issues_results => @issues_results,
-    	 	:projects_results => @projects_results,:users_results => @users_results }%>	
+    	 	:projects_results => @projects_results,:users_results => @users_results ,:show_flag => @obj_flag}%>	
     </div>
 </div>
 
diff --git a/db/migrate/20130807031901_add_user_id_to_shares.rb b/db/migrate/20130807031901_add_user_id_to_shares.rb
new file mode 100644
index 000000000..74f4b8952
--- /dev/null
+++ b/db/migrate/20130807031901_add_user_id_to_shares.rb
@@ -0,0 +1,5 @@
+class AddUserIdToShares < ActiveRecord::Migration
+  def change
+    add_column :shares, :user_id, :integer
+  end
+end