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

Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh

This commit is contained in:
guange 2015-12-18 17:09:01 +08:00
parent 57b1c0c7d8 ea51b24a4e
commit e02b865fa6
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/project_score_helper.rb
View File

@ -22,7 +22,9 @@ module ProjectScoreHelper
#代码提交数量
def changesets_num project
# commit_count(project)
# g = Gitlab.client
# project.gpid.nil? ? 0 : g.commits_total_count(project.gpid)
# commits_total_count(project.gpid)
project.changesets.count
end

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

@ -27,7 +27,7 @@
<div class="fl mt5 ml15"><a href="javascript:void(0);" class="vl_btn fb" onclick="zip()"><span class="vl_zip"></span>ZIP</a> </div>
<%# 针对公开项目：用户必须创建了项目，否则用户无法同步 %>
<% if User.current.id != @project.user_id %>
<div class="fr mt5"><%= link_to "<span class='vl_fork'></span>".html_safe+"Fork", {:controller => 'repositories', :action => 'forked'}, :class=>"vl_btn", :confirm=>"确认要fork该项目吗？" %>
<div class="fr mt5"><%= link_to "<span class='vl_fork'></span>".html_safe+"Fork", {:controller => 'repositories', :action => 'forked'}, :class=>"vl_btn", :confirm=>"平台将为您创建一个新的同名项目和版本库，请问是否继续？" %>
<span href="javascript:void(0);" class="vl_btn_2 fb"><%= @project.forked_count.to_i %></span>
</div>
<% end %>

5
app/views/users/_course_journalsformessage.html.erb
View File

@ -83,7 +83,7 @@
<div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), :alt => "用户头像" %></div>
<div class="homepagePostReplyInputContainer mb10">
<div nhname='new_message_<%= user_activity_id%>' style="display:none;">
<%= form_for('new_form',:url => {:controller => 'words', :action => 'create_reply', :id => activity.id},:method => "post", :remote => true) do |f|%>
<%= form_for('new_form',:url => {:controller => 'words', :action => 'create_reply', :id => activity.id}, :method => "post", :remote => true) do |f|%>
<%= hidden_field_tag 'reference_id', params[:reference_id], :value => activity.id %>
<%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => activity.user.id %>
<%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => activity.id %>
@ -101,4 +101,5 @@
<div class="cl"></div>
</div>
</div>
</div>
</div>

2
public/javascripts/init_activity_KindEditor.js
View File

@ -153,7 +153,7 @@ function init_activity_KindEditor_data(id){
params.cancel_btn.click(function () {
nh_reset_form(params);
});
params.submit_btn.click(function () {
params.submit_btn.one('click',function () {
params.form.submit();
});
params.textarea.data('init', 1);