jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'yuanke_youhua' into 'develop' 

上线问题合并

微信加网站地址，项目简介单词不换行，博客排序，个人主页关注BUG,autoUrl自动识别网址BUG修改，修改密码BUG修改等

See merge request !10
This commit is contained in:
黄井泉 2016-11-24 11:02:58 +08:00
parent f7db47be41 d28f597aed
commit 0fd6ca1969
11 changed files with 108 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -39,3 +39,4 @@ public/javascripts/wechat/node_modules/
.access_token .access_token
tmux*.log tmux*.log
config/wechat.yml config/wechat.yml
config/oneapm.yml

2
app/controllers/blogs_controller.rb
View File

@ -26,7 +26,7 @@ class BlogsController < ApplicationController
@type = 2 @type = 2
@topics.each do |topic| @topics.each do |topic|
topic[:infocount] = get_praise_num(topic) + (topic.parent ? topic.parent.children.count : topic.children.count) topic[:infocount] = get_praise_num(topic) + BlogComment.where("root_id = #{topic.id}").count
if topic[:infocount] < 0 if topic[:infocount] < 0
topic[:infocount] = 0 topic[:infocount] = 0
end end

7
app/controllers/watchers_controller.rb
View File

@ -37,7 +37,9 @@ class WatchersController < ApplicationController
@list = query.order("#{Watcher.table_name}.id desc").limit(limit).offset(@obj_pages.offset).all(); @list = query.order("#{Watcher.table_name}.id desc").limit(limit).offset(@obj_pages.offset).all();
@action = 'fans' @action = 'fans'
else else
if params[:target_id]
@user = User.find(params[:target_id])
end
end end
if params[:object_type] == 'project' if params[:object_type] == 'project'
@ -78,6 +80,9 @@ class WatchersController < ApplicationController
@list = query.order("#{Watcher.table_name}.id desc").limit(limit).offset(@obj_pages.offset).all(); @list = query.order("#{Watcher.table_name}.id desc").limit(limit).offset(@obj_pages.offset).all();
@action = 'fans' @action = 'fans'
else else
if params[:target_id]
@user = User.find(params[:target_id])
end
end end
if params[:object_type] == 'project' if params[:object_type] == 'project'
@project = Project.find(params[:object_id]) @project = Project.find(params[:object_id])

2
app/controllers/wechats_controller.rb
View File

@ -137,7 +137,7 @@ class WechatsController < ActionController::Base
on :fallback, respond: 'fallback message' on :fallback, respond: 'fallback message'
on :click, with: 'FEEDBACK' do |request, key| on :click, with: 'FEEDBACK' do |request, key|
request.reply.text "如有问题反馈，请您：\n1、直接切换至输入框，发微信给我们。\n2、加入QQ群：373967360，直接互动。\n\n如您有合作事宜洽谈，请联系：\n王林春 老师\n手机：13467631747\nQQ：494496321" request.reply.text "如有问题反馈，请您：\n1、直接切换至输入框，发微信给我们。\n2、加入QQ群：373967360，直接互动。\n3、登录网站：www.trustie.net，给我们留言。\n\n如您有合作事宜洽谈，请联系：\n王林春 老师\n手机：13467631747\nQQ：494496321"
end end
on :click, with: 'MY_NEWS' do |request, key| on :click, with: 'MY_NEWS' do |request, key|

2
app/views/layouts/new_base_user.html.erb
View File

@ -148,7 +148,7 @@
<li> <li>
<a href="<%=user_fanslist_user_path(@user) %>"> <a href="<%=user_fanslist_user_path(@user) %>">
<strong>粉丝</strong><br /> <strong>粉丝</strong><br />
<span class="sy_cgrey"><%= @user.watcher_users.count %></span> <span id="user_fans_number" class="sy_cgrey"><%= @user.watcher_users.count %></span>
</a> </a>
</li> </li>
</ul> </ul>

3
app/views/my/account.html.erb
View File

@ -214,7 +214,8 @@
<li>确认密码&nbsp;:&nbsp;</li> <li>确认密码&nbsp;:&nbsp;</li>
</ul> </ul>
<ul class="setting_right "> <ul class="setting_right ">
<li><input id="password" name="password" class="w210" type="password" required="true" nh_required="1"></li> <input style="display:none;">
<li><input id="password" name="password" autocomplete="off" class="w210" type="password" required="true" nh_required="1"></li>
<li><input id="new_password" name="new_password" class="w210" type="password" required="true" nh_required="1"><span class="c_red ml5">请输入8-12个字符</span></li> <li><input id="new_password" name="new_password" class="w210" type="password" required="true" nh_required="1"><span class="c_red ml5">请输入8-12个字符</span></li>
<li><input id="new_password_confirmation" name="new_password_confirmation" class="w210" type="password" required="true" nh_required="1"></li> <li><input id="new_password_confirmation" name="new_password_confirmation" class="w210" type="password" required="true" nh_required="1"></li>
<li class="ml2"> <li class="ml2">

2
app/views/projects/show.html.erb
View File

@ -1,5 +1,5 @@
<!--新版项目头部结束--> <!--新版项目头部结束-->
<div class="ke-block pro_new_info mb10 break_word" style="padding-bottom: 5px" > <div class="ke-block pro_new_info mb10 " style="padding-bottom: 5px;word-break: normal;word-wrap: break-word" >
<div id="project_invite_code"><%= render :partial => 'projects/invite_code' %></div> <div id="project_invite_code"><%= render :partial => 'projects/invite_code' %></div>
<div id="project_description_code" style="padding: 0 15px 10px 15px;"> <div id="project_description_code" style="padding: 0 15px 10px 15px;">
<% if @project.description.blank? %> <% if @project.description.blank? %>

102
app/views/users/_user_fans_item.html.erb
View File

@ -1,55 +1,55 @@
<% unless list.nil?%> <% unless list.nil?%>
<% for item in list %> <% for item in list %>
<div class="courses_list line" id="fans_item_<%=item.id%>"> <div class="courses_list line" id="fans_item_<%=item.id%>">
<div class="courses_list_pic fl"> <div class="courses_list_pic fl">
<a href="<%= user_path(item) %>"> <a href="<%= user_path(item) %>">
<%= image_tag(url_to_avatar(item), :style=>"width:64px;height:64px;",:alt=>"头像") %> <%= image_tag(url_to_avatar(item), :style=>"width:64px;height:64px;",:alt=>"头像") %>
</a> </a>
</div> </div>
<div class="courses_list_info fl ml10"> <div class="courses_list_info fl ml10">
<a href="<%= user_path(item) %>" title="<%= item.show_name %>" class="courses_list_title f14 fb c_blue02 fl"><%= item.show_name %></a> <a href="<%= user_path(item) %>" title="<%= item.show_name %>" class="courses_list_title f14 fb c_blue02 fl"><%= item.show_name %></a>
<div class="cl"></div> <div class="cl"></div>
<div class="courses_list_table "> <div class="courses_list_table ">
<% if item.user_extensions && !item.user_extensions.brief_introduction.nil? && !item.user_extensions.brief_introduction.empty? %> <% if item.user_extensions && !item.user_extensions.brief_introduction.nil? && !item.user_extensions.brief_introduction.empty? %>
<p class="fans_sign" title="<%= item.user_extensions.brief_introduction %>">个性签名：<%= item.user_extensions.brief_introduction %></p> <p class="fans_sign" title="<%= item.user_extensions.brief_introduction %>">个性签名：<%= item.user_extensions.brief_introduction %></p>
<% end %>
<table><tbody><tr>
<td class="td_w60 ">加入时间：</td>
<td class="td_w110 "><%= format_date(item.created_on) %></td>
<% if (item.user_extensions.identity == 0 || item.user_extensions.identity == 1) && !item.user_extensions.school.nil? %>
<td class="td_w60 ">工作单位：</td>
<td class="td_w110 ">
<li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.user_extensions.school.name %>">
<a href="<%= url_for(:controller=>'welcome',:action => 'course', :school_id => item.user_extensions.school.id,:host=>Setting.host_course) %>"><%= item.user_extensions.school.name %></a>
</li>
</td>
<% elsif item.user_extensions.identity == 3 && !item.user_extensions.occupation.nil? && !item.user_extensions.occupation.empty? %>
<td class="td_w60 ">工作单位：</td>
<td class="td_w110 ">
<li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.user_extensions.occupation %>">
<%= item.user_extensions.occupation %>
</li>
</td>
<% elsif item.user_extensions.identity == 2 %>
<td class="td_w60 ">工作单位：</td>
<td class="td_w110 ">
<li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.show_name %>">
<%= item.show_name %>
</li>
</td>
<% end %>
</tr></tbody></table>
</div>
</div>
<!-- 如果只有自己的关注页面才能关注人 取消关注操作，那么还要加 一句&& User.current.id == target.id-->
<% if(User.current.logged? && User.current != item )%>
<%if(item.watched_by?(User.current))%>
<a href="<%= watch_path(:object_type=>'user',:object_id=>item.id,:target_id=>target.id,:action_name=>action_name,:page=>page) %>" class="grey_n_btn fr mt20" data-method="delete" data-remote="true" title="取消关注">取消关注</a>
<% else %>
<a href="<%= watch_path(:object_type=>'user',:object_id=>item.id,:target_id=>target.id,:action_name=>action_name,:page=>page) %>" class="blue_n_btn fr mt20" data-method="post" data-remote="true" title="添加关注">添加关注</a>
<% end %>
<% end %> <% end %>
<table><tbody><tr> <div class="cl"></div>
<td class="td_w60 ">加入时间：</td>
<td class="td_w110 "><%= format_date(item.created_on) %></td>
<% if (item.user_extensions.identity == 0 || item.user_extensions.identity == 1) && !item.user_extensions.school.nil? %>
<td class="td_w60 ">工作单位：</td>
<td class="td_w110 ">
<li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.user_extensions.school.name %>">
<a href="<%= url_for(:controller=>'welcome',:action => 'course', :school_id => item.user_extensions.school.id,:host=>Setting.host_course) %>"><%= item.user_extensions.school.name %></a>
</li>
</td>
<% elsif item.user_extensions.identity == 3 && !item.user_extensions.occupation.nil? && !item.user_extensions.occupation.empty? %>
<td class="td_w60 ">工作单位：</td>
<td class="td_w110 ">
<li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.user_extensions.occupation %>">
<%= item.user_extensions.occupation %>
</li>
</td>
<% elsif item.user_extensions.identity == 2 %>
<td class="td_w60 ">工作单位：</td>
<td class="td_w110 ">
<li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.show_name %>">
<%= item.show_name %>
</li>
</td>
<% end %>
</tr></tbody></table>
</div> </div>
</div> <% end %>
<!-- 如果只有自己的关注页面才能关注人 取消关注操作，那么还要加 一句&& User.current.id == target.id-->
<% if(User.current.logged? && User.current != item )%>
<%if(item.watched_by?(User.current))%>
<a href="<%= watch_path(:object_type=>'user',:object_id=>item.id,:target_id=>target.id,:action_name=>action_name,:page=>page) %>" class="grey_n_btn fr mt20" data-method="delete" data-remote="true" title="取消关注">取消关注</a>
<% else %>
<a href="<%= watch_path(:object_type=>'user',:object_id=>item.id,:target_id=>target.id,:action_name=>action_name,:page=>page) %>" class="blue_n_btn fr mt20" data-method="post" data-remote="true" title="添加关注">添加关注</a>
<% end %>
<% end %>
<div class="cl"></div>
</div>
<% end %>
<% end %> <% end %>

52
app/views/users/user_fanslist.html.erb
View File

@ -7,39 +7,39 @@
} }
</script> </script>
<div class="courses_box" id="RSide" style="margin-left:0; margin-bottom:0; width:728px;"> <div class="courses_box" id="RSide" style="margin-left:0; margin-bottom:0; width:728px;">
<div class="courses_top mb10" id="<%= (@action == 'fans' || @action == 'visitor' ) ? 'nh_fans_list' : 'nh_wacth_list' %>"> <div class="courses_top mb10" id="<%= (@action == 'fans' || @action == 'visitor' ) ? 'nh_fans_list' : 'nh_wacth_list' %>">
<% if @action == 'fans' %> <% if @action == 'fans' %>
<h2 class="courses_h2 fl">粉丝</h2> <h2 class="courses_h2 fl">粉丝</h2>
<div class="courses_select fr">共有<span class="c_orange" nh_name="fans_count" id="fans_span"><%=@obj_count%></span>名粉丝</div> <div class="courses_select fr">共有<span class="c_orange" nh_name="fans_count" id="fans_span"><%=@obj_count%></span>名粉丝</div>
<% elsif @action == 'visitor' %> <% elsif @action == 'visitor' %>
<h2 class="courses_h2 fl">访客</h2> <h2 class="courses_h2 fl">访客</h2>
<div class="courses_select fr">共有<span class="c_orange"><%=@obj_count%></span>访客</div> <div class="courses_select fr">共有<span class="c_orange"><%=@obj_count%></span>访客</div>
<% else %> <% else %>
<h2 class="courses_h2 fl">关注</h2> <h2 class="courses_h2 fl">关注</h2>
<div class="courses_select fr">一共关注<span class="c_orange" nh_name="watcher_count" id="watch_span"><%=@obj_count%></span>人</div> <div class="courses_select fr">一共关注<span class="c_orange" nh_name="watcher_count" id="watch_span"><%=@obj_count%></span>人</div>
<% end %> <% end %>
<div class="cl"></div>
</div>
<div id="users_list">
<%# for item in @list %>
<%= render :partial => 'users/user_fans_item', :locals => {:list => @list,:target=>@user,:action_name=>@action,:page=>params[:page]} %>
<%# end %>
</div>
<p id="nodata" class="nodata" style="display:<%= @list.count > 0 ? 'none' : 'block' %>;"><%= l(:label_no_data) %></p>
<div style="text-align:center;">
<div class="pages" style="width:auto; display:inline-block;">
<ul id="homework_pository_ref_pages">
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true, :is_new => true%>
</ul>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<div id="users_list">
<%# for item in @list %>
<%= render :partial => 'users/user_fans_item', :locals => {:list => @list,:target=>@user,:action_name=>@action,:page=>params[:page]} %>
<%# end %>
</div>
<p id="nodata" class="nodata" style="display:<%= @list.count > 0 ? 'none' : 'block' %>;"><%= l(:label_no_data) %></p>
<div style="text-align:center;">
<div class="pages" style="width:auto; display:inline-block;">
<ul id="homework_pository_ref_pages">
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true, :is_new => true%>
</ul>
<div class="cl"></div>
</div>
</div>
<!--<ul class="wlist" style=" border:none;">-->
<!--<%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>-->
<!--</ul>-->
<!--<div class="cl"></div>-->
</div> </div>
<!--<ul class="wlist" style=" border:none;">-->
<!--<%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>-->
<!--</ul>-->
<!--<div class="cl"></div>-->
</div>
<!--</div>--> <!--</div>-->

4
app/views/watchers/_set_watcher.js.erb
View File

@ -1,7 +1,9 @@
<% if( params[:object_type] == 'user') %> <% if( params[:object_type] == 'user') %>
//点击头像下面的添加关注按钮 //点击头像下面的添加关注按钮
<% if( params[:target_id] == params[:object_id] ) %> <% if( params[:target_id] == params[:object_id] ) %>
$("#watch_user_btn_div").html("<%= escape_javascript render(:partial => "layouts/user_watch_btn", :locals => {:target => watched.first}) %>"); <% if @user %>
$("#watch_user_btn_div").html("<%= escape_javascript render(:partial => "layouts/user_watch_btn", :locals => {:target => watched.first}) %>");
<% end %>
$("#user_fans_number").html("<%= watched.first.watcher_users.count.to_s%>"); $("#user_fans_number").html("<%= watched.first.watcher_users.count.to_s%>");
$(".add_cancel_watch_<%= watched.first.id %>").html("<%= escape_javascript (render :partial => 'users/watch_btn_for_picture', :locals => {:user => watched.first}) %>"); $(".add_cancel_watch_<%= watched.first.id %>").html("<%= escape_javascript (render :partial => 'users/watch_btn_for_picture', :locals => {:user => watched.first}) %>");
$(".fans_count_<%= watched.first.id %>").text("<%= watched.first.watcher_users.count.to_s %>"); $(".fans_count_<%= watched.first.id %>").text("<%= watched.first.watcher_users.count.to_s %>");

17
public/javascripts/application.js
View File

@ -1706,7 +1706,14 @@ function autoUrl(id){
} }
return reStr ; return reStr ;
}); });
$(this).html(html); try{
$(this).html(html);
}
catch (e)
{
console.log(e.name + ": " + e.message);
}
} }
}); });
} }
@ -1725,7 +1732,13 @@ function autoUrl(id){
} }
return reStr ; return reStr ;
}); });
$("#"+id).html(html); try{
$("#"+id).html(html);
}
catch (e)
{
console.log(e.name + ": " + e.message);
}
} }
if(!(!!window.ActiveXObject || "ActiveXObject" in window)){ if(!(!!window.ActiveXObject || "ActiveXObject" in window)){
autoMedia(id); autoMedia(id);