Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/application_controller.rb

@@ -563,6 +563,7 @@ class ApplicationController < ActionController::Base
         uri = URI.parse(back_url)
         # do not redirect user to another host or to the login or register page
         if (uri.relative? || (uri.host == request.host)) && !uri.path.match(%r{/(login|account/register)})
+          back_url = back_url.gsub(%r{\/users\/(\d+)},"/users/"+default.id.to_s)
           redirect_to(back_url)
           return
         end

app/views/users/_user_show.html.erb

@@ -30,9 +30,13 @@
                         <a href="<%= url_for(:controller => 'my', :action => 'account') %>" class="fr gz_btn mr10 ">编辑资料</a>
                     <%else%>
                         <%if(user.watched_by?(User.current))%>
-                            <a id="user_watch_id" href="<%= watch_path(:object_type=> 'user',:object_id=>user.id,:target_id=>user.id) %>" class="fr qx_btn mr10" data-method="delete" data-remote="true" title="取消关注">取消关注</a>
+                            <a id="user_watch_id" href="javascript:void(0);">
+                              <%=link_to "取消关注", watch_path(:object_type=> 'user',:object_id=>user.id,:target_id=>user.id, :remote => "true"), :class => "fr qx_btn mr10", :method => "delete", :title => "取消关注" %>
+                            </a>
                         <% else %>
-                            <a id="user_watch_id" href="<%= watch_path(:object_type=>'user',:object_id=>user.id,:target_id=>user.id) %>" class="fr gz_btn mr10" data-method="post" data-remote="true" title="添加关注">添加关注</a>
+                            <a id="user_watch_id" href="javascript:void(0);">
+                              <%= link_to "添加关注", watch_path(:object_type=>'user',:object_id=>user.id,:target_id=>user.id, :remote => "true"), :class => "fr gz_btn mr10", :method => "post", :title => "添加关注" %>
+                            </a>
                         <% end %>
                     <% end%>
                 <% end %>

app/views/users/user_resource.js.erb

@@ -1,4 +1,5 @@
 $("#search_div").html('<%= escape_javascript( render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>');
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
 $("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#res_count").html(0);
+$("#res_count").html(0);
+$("#checkboxAll").attr('checked',false);