From 5ae580aab03f8c279f64d9e41f9ff07546fb7586 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 13 May 2016 15:10:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_org_teachers_list.html.erb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/views/organizations/_org_teachers_list.html.erb b/app/views/organizations/_org_teachers_list.html.erb
index 702675464..f2523fb9f 100644
--- a/app/views/organizations/_org_teachers_list.html.erb
+++ b/app/views/organizations/_org_teachers_list.html.erb
@@ -6,7 +6,7 @@
           <%= link_to image_tag(url_to_avatar(org_teacher), :width => "90", :height => "90"), user_url_in_org(org_teacher), :alt => "用户头像" %>
         </div>
         <div class="fl">
-          <div class="ml25 mb20"><span class="teacher-name"><%= org_teacher.try(:realname).nil? ? org_teacher.try(:login) : org_teacher.try(:realname) %></span>
+          <div class="ml25 mb20"><span class="teacher-name"><%=link_to org_teacher.try(:realname).nil? ? org_teacher.try(:login) : org_teacher.try(:realname), user_url_in_org(org_teacher) %></span>
             <% unless school.nil? %>
                 <span class="f12 fontGrey2 mr15"><%= school.name %></span>
             <% end %>
@@ -28,12 +28,15 @@
               <div class="block-title">资源数</div>
             </div>
             </div>
-        <% if User.current.admin? %>
+        <% if User.current.admin_of_org?(@organization) %>
             <a href="javascript:void(0);" class="fr teacher-select" onclick="hide($(this),'<%= org_teacher.id %>');" id="hide_<%= org_teacher.id %>"><%= org_teacher.excellent_teacher==0?"设为名师":"取消设置" %></a>
             <!--<a href="javascript:void(0);" class="fr teacher-select">设为名师</a>-->
         <% else %>
-            <%= render :partial => 'layouts/user_watch_btn', :locals => {:target => org_teacher} %>
-            <a href="javascript:void(0);" class="fr teacher-select">关注</a>
+            <!--<%# if(org_teacher.watched_by?(User.current)) %>-->
+                <!--<%#= link_to "取消关注",watch_path(:object_type=> 'user',:object_id=>org_teacher.id,:target_id=>org_teacher.id),:class => "fr teacher-select", :method => "delete",:remote => "true", :title => "取消关注"%>-->
+            <!--<%# else %>-->
+                <!--<%#= link_to "添加关注",watch_path(:object_type=> 'user',:object_id=>org_teacher.id,:target_id=>org_teacher.id),:class => "fr teacher-select", :method => "post",:remote => "true", :title => "添加关注"%>-->
+            <!--<%# end %>-->
         <% end %>
       </div>
       <div class="cl"></div>