- <%= link_to (topic.replies_count), forum_memo_path(topic.forum, topic),:target =>'_blank',:class=>'linkGrey2' %>
+ <% replies_count = Memo.where("root_id = #{topic.id}").count %>
+ <%= link_to (replies_count), forum_memo_path(topic.forum, topic),:target =>'_blank',:class=>'linkGrey2' %>
<%= get_praise_num(topic)%>
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index b57feb5bd..f5509959b 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -7,13 +7,10 @@
+
+ <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
+
+
+
+ <%= render :partial => 'users/message_contents', :locals => {:comment => reply, :type => 'Memo', :user_activity_id => @memo.id}%>
+
+
+
<%= reply.content.gsub(/script/, "script ").html_safe %>
+
+
+
+
+
+ <%= render :partial => "praise_tread/praise", :locals => {:activity => reply, :user_activity_id => reply.id, :type => "reply"} %>
+
+
+ <%= link_to(
+ l(:button_reply),
+ {:action => 'quote', :id => reply},
+ :remote => true,
+ :method => 'get',
+ :title => l(:button_reply)) %>
+ ︿
+
+ <%= link_to(
+ l(:button_delete),
+ forum_memo_path(@memo.forum, reply),
+ :method => :delete,
+ :id => "delete_reply_#{reply.id}",
+ :class => 'fr mr20 undis',
+ :data => {:confirm => l(:text_are_you_sure)},
+ :title => l(:button_delete)
+ ) if @memo.author.id == User.current.id || User.current.admin? %>
+
+
+
+
+
+
+
+
diff --git a/app/views/memos/show.js.erb b/app/views/memos/show.js.erb
new file mode 100644
index 000000000..8ac3f6194
--- /dev/null
+++ b/app/views/memos/show.js.erb
@@ -0,0 +1 @@
+$("#more_memo_replies").replaceWith("<%= escape_javascript(render :partial => 'memos/memo_all_replies')%>");
\ No newline at end of file
diff --git a/app/views/praise_tread/praise_plus.js.erb b/app/views/praise_tread/praise_plus.js.erb
index 29041cd57..c06ad88e5 100644
--- a/app/views/praise_tread/praise_plus.js.erb
+++ b/app/views/praise_tread/praise_plus.js.erb
@@ -1,13 +1,13 @@
-<% if @obj_type == 'Memo'%>
- $('#praise_tread_<%= @obj.id %>').html('<%= j(
- render :partial => "/memos/praise_tread",:locals => {:obj => @obj,:user_id => User.current.id,:horizontal => @horizontal}
- )%>');
-<% elsif @activity %>
+<% if @activity %>
<% if @type.to_s == 'activity' %>
$('#praise_count_<%=@user_activity_id %>').html('<%=j(render :partial=> "praise_tread/praise", :locals => {:activity=>@obj, :user_activity_id=>@user_activity_id,:type=>"activity"})%>');
<% else @type.to_s == 'reply' %>
$('#reply_praise_count_<%=@user_activity_id %>').html('<%=j(render :partial=> "praise_tread/praise", :locals => {:activity=>@obj, :user_activity_id=>@user_activity_id,:type=>"reply"})%>');
<% end %>
+<% elsif @obj_type == 'Memo'%>
+ $('#praise_tread_<%= @obj.id %>').html('<%= j(
+ render :partial => "/memos/praise_tread",:locals => {:obj => @obj,:user_id => User.current.id,:horizontal => @horizontal}
+ )%>');
<% else %>
$('#praise_tread_<%= @obj.id %>').html('<%= j(
render :partial => "/praise_tread/praise_tread",:locals => {:obj => @obj,:user_id => User.current.id,:horizontal => @horizontal}
diff --git a/app/views/users/reply_detail.js.erb b/app/views/users/reply_detail.js.erb
index 097d36720..23de03a76 100644
--- a/app/views/users/reply_detail.js.erb
+++ b/app/views/users/reply_detail.js.erb
@@ -43,6 +43,8 @@ $("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(re
window.location.href = "<%=org_document_comment_path(:id => @root.id, :organization_id => @root.organization.id) %>";
<% end %>
<% elsif @type == 'Syllabus' %>
-$("#activity_post_reply_<%= @user_activity_id %>").html("<%= escape_javascript(render :partial => 'syllabuses/syllabus_post_reply', :locals => {:activity => @root, :user_activity_id => @user_activity_id}) %>");
+ $("#activity_post_reply_<%= @user_activity_id %>").html("<%= escape_javascript(render :partial => 'syllabuses/syllabus_post_reply', :locals => {:activity => @root, :user_activity_id => @user_activity_id}) %>");
+<% elsif @type == 'Memo' %>
+ window.location.href = "<%=forum_memo_path(@root.forum_id, @root) %>";
<% end %>
sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
\ No newline at end of file
diff --git a/app/views/users/show_all_replies.js.erb b/app/views/users/show_all_replies.js.erb
index d5d2a6b54..b02cb0add 100644
--- a/app/views/users/show_all_replies.js.erb
+++ b/app/views/users/show_all_replies.js.erb
@@ -5,7 +5,7 @@
$('#comment_reply_<%=@comment.id %>').html("<%= escape_javascript(render :partial => 'projects/journal_comment_reply', :locals => {:comment => @comment.parent, :user_activity_id => @user_activity_id, :parent_id => @parent_id})%>");
<% elsif params[:type] == 'is_project_issue' %>
$('#comment_reply_<%=@comment.id %>').html("<%= escape_javascript(render :partial => 'projects/project_issue_comments_reply', :locals => {:comment => @comment.parent, :user_activity_id => @user_activity_id, :parent_id => @parent_id})%>");
- <% elsif (@comment.class.to_s == 'Message' || @comment.class.to_s == 'BlogComment' || @comment.class.to_s == 'OrgDocumentComment') %>
+ <% elsif (@comment.class.to_s == 'Message' || @comment.class.to_s == 'BlogComment' || @comment.class.to_s == 'OrgDocumentComment' || @comment.class.to_s == 'Memo') %>
$('#comment_reply_<%=@comment.id %>').html("<%= escape_javascript(render :partial => 'users/journal_comment_reply', :locals => {:comment => @comment.parent, :type => params[:type], :user_activity_id => @user_activity_id, :parent_id => @parent_id})%>");
<% else %>
$('#comment_reply_<%=@comment.id %>').html("<%= escape_javascript(render :partial => 'users/comment_reply', :locals => {:comment => @comment.parent, :type => params[:type], :user_activity_id => @user_activity_id, :parent_id => @parent_id})%>");
diff --git a/db/migrate/20161128072528_add_root_id_to_memos.rb b/db/migrate/20161128072528_add_root_id_to_memos.rb
new file mode 100644
index 000000000..2f7d60ea1
--- /dev/null
+++ b/db/migrate/20161128072528_add_root_id_to_memos.rb
@@ -0,0 +1,26 @@
+class AddRootIdToMemos < ActiveRecord::Migration
+ def change
+ add_column :memos, :root_id, :integer
+ add_index :memos, :root_id
+
+ def get_base_parent comment
+ comm = comment
+ while comm.parent
+ comm = comm.parent
+ end
+ comm
+ end
+
+ count = Memo.all.count / 30 + 2
+ transaction do
+ for i in 1 ... count do i
+ Memo.page(i).per(30).each do |memo|
+ unless memo.parent.nil?
+ parent = get_base_parent memo
+ memo.update_column('root_id', parent.id)
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a57b4fa4c..bd3645e2c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20161125024643) do
+ActiveRecord::Schema.define(:version => 20161128072528) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@@ -325,16 +325,14 @@ ActiveRecord::Schema.define(:version => 20161125024643) do
add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids"
create_table "changesets", :force => true do |t|
- t.integer "repository_id", :null => false
- t.string "revision", :null => false
+ t.integer "repository_id", :null => false
+ t.string "revision", :null => false
t.string "committer"
- t.datetime "committed_on", :null => false
+ t.datetime "committed_on", :null => false
t.text "comments"
t.date "commit_date"
t.string "scmid"
t.integer "user_id"
- t.integer "project_id"
- t.integer "type", :default => 0
end
add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on"
@@ -518,6 +516,20 @@ ActiveRecord::Schema.define(:version => 20161125024643) do
t.integer "container_id", :default => 0
end
+ create_table "course_class_post", :id => false, :force => true do |t|
+ t.integer "班级id", :default => 0, :null => false
+ t.string "班级名"
+ t.integer "帖子id", :default => 0, :null => false
+ t.integer "主贴id"
+ t.string "帖子标题", :default => "", :null => false
+ t.text "帖子内容"
+ t.integer "帖子用户id"
+ t.integer "帖子回复数", :default => 0, :null => false
+ t.integer "最后回帖id"
+ t.datetime "发帖时间", :null => false
+ t.datetime "帖子更新时间", :null => false
+ end
+
create_table "course_contributor_scores", :force => true do |t|
t.integer "course_id"
t.integer "user_id"
@@ -996,10 +1008,6 @@ ActiveRecord::Schema.define(:version => 20161125024643) do
t.datetime "updated_at", :null => false
end
- create_table "innodb_monitor", :id => false, :force => true do |t|
- t.integer "a"
- end
-
create_table "invite_lists", :force => true do |t|
t.integer "project_id"
t.integer "user_id"
@@ -1211,8 +1219,11 @@ ActiveRecord::Schema.define(:version => 20161125024643) do
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.integer "viewed_count", :default => 0
+ t.integer "root_id"
end
+ add_index "memos", ["root_id"], :name => "index_memos_on_root_id"
+
create_table "message_alls", :force => true do |t|
t.integer "user_id"
t.integer "message_id"
From 4c45518913b614628949cacf0cffb5a87c297de0 Mon Sep 17 00:00:00 2001
From: cxt
Date: Tue, 29 Nov 2016 10:22:54 +0800
Subject: [PATCH 004/110] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=95=8C?=
=?UTF-8?q?=E9=9D=A2=E6=97=A0=E6=B3=95=E6=90=9C=E7=B4=A2=E8=8B=B1=E6=96=87?=
=?UTF-8?q?=E5=90=8D=E7=A7=B0=E7=9A=84=E8=AF=BE=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/admin_controller.rb | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 1f8cdd275..d8fc9ce28 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -175,8 +175,10 @@ class AdminController < ApplicationController
def courses
@name = params[:name].to_s.strip.downcase
if @name && @name != ""
- @courses = Course.select{ |course| course.teacher && ((course.teacher.show_name).include?(@name) || course.name.include?(@name))}
- @courses = @courses.sort{|x, y| y.created_at <=> x.created_at}
+ all_user_ids = Course.all.map{|course| course.tea_id}
+ user_str_ids = search_user_by_name all_user_ids, @name
+ user_ids = user_str_ids.empty? ? "(-1)" : "(" + user_str_ids.join(",") + ")"
+ @courses = Course.where("tea_id in #{user_ids} or name like '%#{@name}%'").reorder("created_at desc")
else
@courses = Course.order('created_at desc')
end
From 7ea9f000540645763f050ccdd7e2e99f8d49bbed Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 29 Nov 2016 10:52:57 +0800
Subject: [PATCH 005/110] =?UTF-8?q?pull=20request=20=E6=94=B9=E5=8A=A8?=
=?UTF-8?q?=E5=AF=B9=E6=AF=94=E6=98=BE=E7=A4=BA=20=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/pull_requests_controller.rb | 684 +++++++++---------
.../_pull_request_changes.html.erb | 84 +--
app/views/repositories/_change_diff.html.erb | 27 +
app/views/repositories/commit_diff.html.erb | 33 +-
4 files changed, 398 insertions(+), 430 deletions(-)
create mode 100644 app/views/repositories/_change_diff.html.erb
diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index 72a1132c9..8e99767aa 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -1,353 +1,331 @@
-# encoding: utf-8
-# 如果你对改模块任何功能不清楚，请不要随便改
-# @Hjqreturn
-class PullRequestsController < ApplicationController
- before_filter :authorize_logged
- before_filter :find_project_and_repository
- before_filter :connect_gitlab, :only => [:index, :show, :create, :accept_pull_request, :pull_request_commits, :pull_request_changes, :new, :update_pull_request, :pull_request_comments, :create_pull_request_comment, :compare_pull_request]
- before_filter :member_allowed, :only => [:new, :create]
- before_filter :manager_allowed, :only => [:accept_pull_request]
-
- layout "base_projects"
- include PullRequestsHelper
- include ApplicationHelper
-
- require 'ostruct'
-
- # 返回json格式
- def index
- # project_menu_type 为了控制base顶部导航
- @project_menu_type = 6
- # 不符合pullrequest条件的给出提示
- @allow_to_pull_request = allow_pull_request(@project) > 0
-
- type = params[:type]
- merge_requests = @g.merge_requests(@project.gpid)
- merge_requests_count = merge_requests.count
- case type
- when nil, "1"
- @requests = merge_requests.select{|request| request.state == "opened" || request.state == "reopened"}
- # 更新统计数字
- project_score = @project.project_score.update_column(:pull_request_num, merge_requests_count)
- when "2"
- @requests = merge_requests.select{|request| request.state == "merged"}
- when "3"
- @requests = merge_requests.select{|request| request.state == "closed"}
- end
- @requests_opened_count = @requests.count
- @requests_merged_count = merge_requests.select{|request| request.state == "merged"}.count
- @requests_closed_count = merge_requests.select{|request| request.state == "closed"}.count
-
- @limit = 10
- @is_remote = true
- @count = type_count(type, @requests_opened_count, @requests_merged_count, @requests_closed_count)
- @pages = Paginator.new @count, @limit, params['page'] || 1
- @offset ||= @pages.offset
- @requests = paginateHelper @requests, 10
- respond_to do |format|
- format.html
- format.js
- end
- end
-
- # 主要取源项目和目标项目分支及标识（用户名/版本库名）
- # @tip 为空的时候表明发送的pr请求有改动，为1的时候源分支和目标分支没有改动，则不能成功创建
- def new
- # project_menu_type 为了控制base顶部导航
- @project_menu_type = 6
- @tip = params[:show_tip]
- identifier = get_rep_identifier_by_project @project
- @source_project_name = "#{get_user_name(@project.user_id)}/#{identifier}"
- @source_rev = @g.branches(@project.gpid).map{|b| b.name}
-
- # 获取forked源项目信息
- if @project.forked_from_project_id
- @forked_project = Project.find(@project.forked_from_project_id)
- identifier = get_rep_identifier_by_project @forked_project
- @forked_project_name = "#{get_user_name(@forked_project.user_id)}/#{identifier}"
- @forked_rev = @g.branches(@forked_project.gpid).map{|b| b.name}
- end
- end
-
- # Creates a merge request.
- # If the operation is successful, 200 and the newly created merge request is returned. If an error occurs, an error number and a message explaining the reason is returned.
- #
- # @example
- # Gitlab.create_merge_request(5, 'New merge request',
- # :source_branch => 'source_branch', :target_branch => 'target_branch')
- # Gitlab.create_merge_request(5, 'New merge request',
- # :source_branch => 'source_branch', :target_branch => 'target_branch', :assignee_id => 42)
- #
- # @param [Integer] project The ID of a project.
- # @param [String] title The title of a merge request.
- # @param [Hash] options A customizable set of options.
- # @option options [String] :source_branch (required) The source branch name.
- # @option options [String] :target_branch (required) The target branch name.
- # @option options [Integer] :assignee_id (optional) The ID of a user to assign merge request.
- # @return [Gitlab::ObjectifiedHash] Information about created merge request.
- def create
- title = params[:title]
- description = params[:description]
- source_branch = params[:source_branch]
- target_branch = params[:target_branch]
- target_project_id = params[:target_project_id]
- begin
- # 如果分支有改动
- if compare_pull_request(source_branch, target_project_id, target_branch)
- # 如果传送了目标项目ID即向fork源项目发送请求
- # if params[:forked_project_id] && params[:source_project] == "forked_project_name"
- if !params[:target_project_id].blank?
- target_project_id = params[:forked_project_id].to_i
- request = @g.create_merge_request(@project.gpid, title, User.current.gid, :description => description, :source_branch => source_branch, :target_branch => target_branch, :target_project_id => target_project_id)
- @fork_project_name = Project.find(params[:target_project_id]).try(:name)
- @fork_pr_message = true if @fork_project_name
- else
- request = @g.create_merge_request(@project.gpid, title, User.current.gid, :description => description, :source_branch => source_branch, :target_branch => target_branch)
- respond_to do |format|
- format.js{redirect_to project_pull_request_path(request.id, :project_id => @project.id)}
- end
- end
- else
- tip = 1
- respond_to do |format|
- format.js{redirect_to new_project_pull_request_path(:show_tip => tip)}
- end
- end
- rescue Gitlab::Error::Forbidden => e
- @message = l(:label_pull_request_forbidden)
- rescue Gitlab::Error::Conflict => e
- @message = l(:label_pull_request_conflic)
- rescue Gitlab::Error::NotFound => e
- @message = l(:label_pull_request_notfound)
- rescue Exception => e
- puts e
- end
- end
-
- # Compare branch for MR
- # 判断源分支和目标分支是否有改动
- # status 为true 表示有改动; false:便是没有改动
- def compare_pull_request source_branch, target_project, target_branch
- user_name_source = @project.owner.try(:login)
- identifier = @repository.identifier.downcase
- git_source_tree = '--git-dir=/home/git/repositories/' + user_name_source + '/' + identifier + '.git'
- if target_project
- forked_source_project = Project.find(target_project)
- user_name_target = forked_source_project.owner.try(:login)
- git_target_tree = '--git-dir=/home/git/repositories/' + user_name_target + '/' + identifier + '.git'
- git_sourse_commit_id = @g.get_branch_commit_id(@project.gpid, git_source_tree, source_branch)
- git_target_commit_id = @g.get_branch_commit_id(forked_source_project.gpid, git_target_tree, target_branch)
- else
- git_sourse_commit_id = @g.get_branch_commit_id(@project.gpid, git_source_tree, source_branch)
- git_target_commit_id = @g.get_branch_commit_id(@project.gpid, git_source_tree, target_branch)
- end
- status = (git_sourse_commit_id.try(:commit_id) == git_target_commit_id.try(:commit_id) ? false : true)
- end
-
- # @project_menu_type 为了控制base顶部导航
- # merge_when_succeeds
- def show
- # compare_pull_request source_project, source_branch, target_project, target_branch
- # compare_pull_request
- @project_menu_type = 6
- @type = params[:type]
- @request = @g.merge_request(@project.gpid, params[:id])
- @commits = @g.merge_request_commits(@project.gpid, params[:id].to_i)
- @commits_count = @commits.count
- # @commits_day = @commits.chunk
- @changes = @g.merge_request_changes(@project.gpid, params[:id]).try(:changes)
- @changes_count = @changes.count
- @comments = @g.merge_request_comments(@project.gpid, params[:id]).reverse
- @comments_count = @comments.count
-
- @limit = 10
- @is_remote = true
- @count = @comments_count
- @pages = Paginator.new @count, @limit, params['page'] || 1
- @offset ||= @pages.offset
- @comments = paginateHelper @comments, 10
- end
-
- # Accept a merge request.
- # If merge success you get 200 OK.
- # Accept a merge request.
- #
- # @example
- # Gitlab.accept_pull_rquest(5, 1)
- #
- # @param [Integer] project The ID of a project.
- # @param [Integer] id The ID of a merge request.
- # @return [Gitlab::ObjectifiedHash]
- def accept_pull_request
- begin
- status = @g.accept_merge_rquest(@project.gpid, params[:id], User.current.gid)
- PullRequest.create(:pull_request_id => status.id, :user_id => User.current.id, :gpid => status.project_id)
- respond_to do |format|
- format.js{redirect_to project_pull_request_path(status.id, :project_id => @project.id)}
- end
- rescue Exception => e
- @message = e.message
- end
- end
-
- # Updates a merge request.
- #
- # @example
- # Gitlab.update_merge_request(5, 42, :title => 'New title')
- #
- # @param [Integer] project The ID of a project.
- # @param [Integer] id The ID of a merge request.
- # @param [Hash] options A customizable set of options.
- # @option options [String] :title The title of a merge request.
- # @option options [String] :source_branch The source branch name.
- # @option options [String] :target_branch The target branch name.
- # @option options [Integer] :assignee_id The ID of a user to assign merge request.
- # @option options [String] :state_event New state (close|reopen|merge).
- # @return [Gitlab::ObjectifiedHash] Information about updated merge request.
- def update_pull_request
- begin
- @g.update_merge_request(@project.gpid, params[:id], User.current.gid, :state_event => params[:state])
- respond_to do |format|
- format.html{redirect_to project_pull_request_path(params[:id], :project_id => @project.id)}
- end
- rescue Exception => e
- @message = e.message
- end
- end
-
- # Creates a merge request.
- #
- # @example
- # Gitlab.create_merge_request(5, 'New merge request',
- # :source_branch => 'source_branch', :target_branch => 'target_branch')
- # Gitlab.create_merge_request(5, 'New merge request',
- # :source_branch => 'source_branch', :target_branch => 'target_branch', :assignee_id => 42)
- def create_pull_request_comment
- content = params[:pull_request_comment]
- begin
- @comments = @g.create_merge_request_comment(@project.gpid, params[:id], content, User.current.gid)
- respond_to do |format|
- format.js{redirect_to project_pull_request_path(params[:id], :project_id => @project.id)}
- end
- rescue Exception => e
- @message = e.message
- end
- end
-
- # Gets the comments on a merge request.
- #
- # @example
- # Gitlab.merge_request_comments(5, 1)
- def pull_request_comments
- begin
- @comments = @g.merge_request_comments(@project.gpid, params[:id]).reverse
- @comments_count = @comments.count
-
- @limit = 10
- @is_remote = true
- @count = @comments_count
- @pages = Paginator.new @count, @limit, params['page'] || 1
- @offset ||= @pages.offset
- @comments = paginateHelper @comments, 10
- rescue Exception => e
- @message = e.message
- end
- end
-
- # Get a list of merge request commits.
- # Parameters:
- # id (required) - The ID of a project
- # merge_request_id (required) - The ID of MR
- def pull_request_commits
- begin
- @type = params[:type]
- @commits = @g.merge_request_commits(@project.gpid, params[:id])
- @commits_count = @commits.count
-
- @limit = 10
- @is_remote = true
- @count = @commits_count
- @pages = Paginator.new @count, @limit, params['page'] || 1
- @offset ||= @pages.offset
- @commits = paginateHelper @commits, 10
- rescue Exception => e
- @message = e.message
- end
- end
-
- # Shows information about the merge request including its files and changes. With GitLab 8.2 the return fields upvotes and downvotes are deprecated and always return 0.
- # Parameters:
- # id (required) - The ID of a project
- # merge_request_id (required) - The ID of MR
- def pull_request_changes
-
- @type = params[:type]
- @changes = @g.merge_request_changes(@project.gpid, params[:id]).try(:changes)
- logger.info("###############################{@changes}")
- diff = ActiveSupport::JSON.decode(@changes).first
- diff = OpenStruct.new(diff)
- diff_file = Trustie::Gitlab::Diff::File.new(diff)
- logger.info("##############################")
- output = ''
- diff_file.diff_lines.each_with_index do |line, index|
- type = line.type
- last_line = line.new_pos
- line_old = line.old_pos.to_s
-
-
- if type == 'match'
- ## 表示没有修改，两个都要显示行号
- output += "|#{line_old.center(4)}|#{last_line.to_s.center(4)}|#{line.text}\n"
- else
- old_line = type == 'new' ? ' '*4: line_old
- new_line = type == 'old' ? ' '*4: last_line
- output += "|#{old_line.to_s.center(4)}|#{new_line.to_s.center(4)}|#{line.text}\n"
- end
- end
-
- @changes_count = @changes.count
-
- @is_remote = true
- @count = @changes_count
- @pages = Paginator.new @count, @limit, params['page'] || 1
- @offset ||= @pages.offset
- @changes = paginateHelper @changes, 10
-
- end
-
- private
- # post 相关操作权限控制
- # 项目管理员可操作
- def manager_allowed
- unless is_project_manager?(User.current.id, @project.id)
- return render_403
- end
- end
-
- # 项目成员可操作
- def member_allowed
- unless User.current.member_of?(@project)
- return render_403
- end
- end
-
- def authorize_logged
- if !User.current.logged?
- redirect_to signin_path
- return
- end
- end
-
- def connect_gitlab
- @g = Gitlab.client
- end
-
- def find_project_and_repository
- @project = Project.find(params[:project_id])
- render_404 if @project.gpid.blank?
- @repository = Repository.where(:project_id => @project.id, :type => "Repository::Gitlab").first
- rescue ActiveRecord::RecordNotFound
- render_404
- end
-
-end
+# encoding: utf-8
+# 如果你对改模块任何功能不清楚，请不要随便改
+# @Hjqreturn
+class PullRequestsController < ApplicationController
+ before_filter :authorize_logged
+ before_filter :find_project_and_repository
+ before_filter :connect_gitlab, :only => [:index, :show, :create, :accept_pull_request, :pull_request_commits, :pull_request_changes, :new, :update_pull_request, :pull_request_comments, :create_pull_request_comment, :compare_pull_request]
+ before_filter :member_allowed, :only => [:new, :create]
+ before_filter :manager_allowed, :only => [:accept_pull_request]
+
+ layout "base_projects"
+ include PullRequestsHelper
+ include ApplicationHelper
+
+ require 'ostruct'
+
+ # 返回json格式
+ def index
+ # project_menu_type 为了控制base顶部导航
+ @project_menu_type = 6
+ # 不符合pullrequest条件的给出提示
+ @allow_to_pull_request = allow_pull_request(@project) > 0
+
+ type = params[:type]
+ merge_requests = @g.merge_requests(@project.gpid)
+ merge_requests_count = merge_requests.count
+ case type
+ when nil, "1"
+ @requests = merge_requests.select{|request| request.state == "opened" || request.state == "reopened"}
+ # 更新统计数字
+ project_score = @project.project_score.update_column(:pull_request_num, merge_requests_count)
+ when "2"
+ @requests = merge_requests.select{|request| request.state == "merged"}
+ when "3"
+ @requests = merge_requests.select{|request| request.state == "closed"}
+ end
+ @requests_opened_count = @requests.count
+ @requests_merged_count = merge_requests.select{|request| request.state == "merged"}.count
+ @requests_closed_count = merge_requests.select{|request| request.state == "closed"}.count
+
+ @limit = 10
+ @is_remote = true
+ @count = type_count(type, @requests_opened_count, @requests_merged_count, @requests_closed_count)
+ @pages = Paginator.new @count, @limit, params['page'] || 1
+ @offset ||= @pages.offset
+ @requests = paginateHelper @requests, 10
+ respond_to do |format|
+ format.html
+ format.js
+ end
+ end
+
+ # 主要取源项目和目标项目分支及标识（用户名/版本库名）
+ # @tip 为空的时候表明发送的pr请求有改动，为1的时候源分支和目标分支没有改动，则不能成功创建
+ def new
+ # project_menu_type 为了控制base顶部导航
+ @project_menu_type = 6
+ @tip = params[:show_tip]
+ identifier = get_rep_identifier_by_project @project
+ @source_project_name = "#{get_user_name(@project.user_id)}/#{identifier}"
+ @source_rev = @g.branches(@project.gpid).map{|b| b.name}
+
+ # 获取forked源项目信息
+ if @project.forked_from_project_id
+ @forked_project = Project.find(@project.forked_from_project_id)
+ identifier = get_rep_identifier_by_project @forked_project
+ @forked_project_name = "#{get_user_name(@forked_project.user_id)}/#{identifier}"
+ @forked_rev = @g.branches(@forked_project.gpid).map{|b| b.name}
+ end
+ end
+
+ # Creates a merge request.
+ # If the operation is successful, 200 and the newly created merge request is returned. If an error occurs, an error number and a message explaining the reason is returned.
+ #
+ # @example
+ # Gitlab.create_merge_request(5, 'New merge request',
+ # :source_branch => 'source_branch', :target_branch => 'target_branch')
+ # Gitlab.create_merge_request(5, 'New merge request',
+ # :source_branch => 'source_branch', :target_branch => 'target_branch', :assignee_id => 42)
+ #
+ # @param [Integer] project The ID of a project.
+ # @param [String] title The title of a merge request.
+ # @param [Hash] options A customizable set of options.
+ # @option options [String] :source_branch (required) The source branch name.
+ # @option options [String] :target_branch (required) The target branch name.
+ # @option options [Integer] :assignee_id (optional) The ID of a user to assign merge request.
+ # @return [Gitlab::ObjectifiedHash] Information about created merge request.
+ def create
+ title = params[:title]
+ description = params[:description]
+ source_branch = params[:source_branch]
+ target_branch = params[:target_branch]
+ target_project_id = params[:target_project_id]
+ begin
+ # 如果分支有改动
+ if compare_pull_request(source_branch, target_project_id, target_branch)
+ # 如果传送了目标项目ID即向fork源项目发送请求
+ # if params[:forked_project_id] && params[:source_project] == "forked_project_name"
+ if !params[:target_project_id].blank?
+ target_project_id = params[:forked_project_id].to_i
+ request = @g.create_merge_request(@project.gpid, title, User.current.gid, :description => description, :source_branch => source_branch, :target_branch => target_branch, :target_project_id => target_project_id)
+ @fork_project_name = Project.find(params[:target_project_id]).try(:name)
+ @fork_pr_message = true if @fork_project_name
+ else
+ request = @g.create_merge_request(@project.gpid, title, User.current.gid, :description => description, :source_branch => source_branch, :target_branch => target_branch)
+ respond_to do |format|
+ format.js{redirect_to project_pull_request_path(request.id, :project_id => @project.id)}
+ end
+ end
+ else
+ tip = 1
+ respond_to do |format|
+ format.js{redirect_to new_project_pull_request_path(:show_tip => tip)}
+ end
+ end
+ rescue Gitlab::Error::Forbidden => e
+ @message = l(:label_pull_request_forbidden)
+ rescue Gitlab::Error::Conflict => e
+ @message = l(:label_pull_request_conflic)
+ rescue Gitlab::Error::NotFound => e
+ @message = l(:label_pull_request_notfound)
+ rescue Exception => e
+ puts e
+ end
+ end
+
+ # Compare branch for MR
+ # 判断源分支和目标分支是否有改动
+ # status 为true 表示有改动; false:便是没有改动
+ def compare_pull_request source_branch, target_project, target_branch
+ user_name_source = @project.owner.try(:login)
+ identifier = @repository.identifier.downcase
+ git_source_tree = '--git-dir=/home/git/repositories/' + user_name_source + '/' + identifier + '.git'
+ if target_project
+ forked_source_project = Project.find(target_project)
+ user_name_target = forked_source_project.owner.try(:login)
+ git_target_tree = '--git-dir=/home/git/repositories/' + user_name_target + '/' + identifier + '.git'
+ git_sourse_commit_id = @g.get_branch_commit_id(@project.gpid, git_source_tree, source_branch)
+ git_target_commit_id = @g.get_branch_commit_id(forked_source_project.gpid, git_target_tree, target_branch)
+ else
+ git_sourse_commit_id = @g.get_branch_commit_id(@project.gpid, git_source_tree, source_branch)
+ git_target_commit_id = @g.get_branch_commit_id(@project.gpid, git_source_tree, target_branch)
+ end
+ status = (git_sourse_commit_id.try(:commit_id) == git_target_commit_id.try(:commit_id) ? false : true)
+ end
+
+ # @project_menu_type 为了控制base顶部导航
+ # merge_when_succeeds
+ def show
+ # compare_pull_request source_project, source_branch, target_project, target_branch
+ # compare_pull_request
+ @project_menu_type = 6
+ @type = params[:type]
+ @request = @g.merge_request(@project.gpid, params[:id])
+ @commits = @g.merge_request_commits(@project.gpid, params[:id].to_i)
+ @commits_count = @commits.count
+ # @commits_day = @commits.chunk
+ @changes = @g.merge_request_changes(@project.gpid, params[:id]).try(:changes)
+ @changes_count = @changes.count
+ @comments = @g.merge_request_comments(@project.gpid, params[:id]).reverse
+ @comments_count = @comments.count
+
+ @limit = 10
+ @is_remote = true
+ @count = @comments_count
+ @pages = Paginator.new @count, @limit, params['page'] || 1
+ @offset ||= @pages.offset
+ @comments = paginateHelper @comments, 10
+ end
+
+ # Accept a merge request.
+ # If merge success you get 200 OK.
+ # Accept a merge request.
+ #
+ # @example
+ # Gitlab.accept_pull_rquest(5, 1)
+ #
+ # @param [Integer] project The ID of a project.
+ # @param [Integer] id The ID of a merge request.
+ # @return [Gitlab::ObjectifiedHash]
+ def accept_pull_request
+ begin
+ status = @g.accept_merge_rquest(@project.gpid, params[:id], User.current.gid)
+ PullRequest.create(:pull_request_id => status.id, :user_id => User.current.id, :gpid => status.project_id)
+ respond_to do |format|
+ format.js{redirect_to project_pull_request_path(status.id, :project_id => @project.id)}
+ end
+ rescue Exception => e
+ @message = e.message
+ end
+ end
+
+ # Updates a merge request.
+ #
+ # @example
+ # Gitlab.update_merge_request(5, 42, :title => 'New title')
+ #
+ # @param [Integer] project The ID of a project.
+ # @param [Integer] id The ID of a merge request.
+ # @param [Hash] options A customizable set of options.
+ # @option options [String] :title The title of a merge request.
+ # @option options [String] :source_branch The source branch name.
+ # @option options [String] :target_branch The target branch name.
+ # @option options [Integer] :assignee_id The ID of a user to assign merge request.
+ # @option options [String] :state_event New state (close|reopen|merge).
+ # @return [Gitlab::ObjectifiedHash] Information about updated merge request.
+ def update_pull_request
+ begin
+ @g.update_merge_request(@project.gpid, params[:id], User.current.gid, :state_event => params[:state])
+ respond_to do |format|
+ format.html{redirect_to project_pull_request_path(params[:id], :project_id => @project.id)}
+ end
+ rescue Exception => e
+ @message = e.message
+ end
+ end
+
+ # Creates a merge request.
+ #
+ # @example
+ # Gitlab.create_merge_request(5, 'New merge request',
+ # :source_branch => 'source_branch', :target_branch => 'target_branch')
+ # Gitlab.create_merge_request(5, 'New merge request',
+ # :source_branch => 'source_branch', :target_branch => 'target_branch', :assignee_id => 42)
+ def create_pull_request_comment
+ content = params[:pull_request_comment]
+ begin
+ @comments = @g.create_merge_request_comment(@project.gpid, params[:id], content, User.current.gid)
+ respond_to do |format|
+ format.js{redirect_to project_pull_request_path(params[:id], :project_id => @project.id)}
+ end
+ rescue Exception => e
+ @message = e.message
+ end
+ end
+
+ # Gets the comments on a merge request.
+ #
+ # @example
+ # Gitlab.merge_request_comments(5, 1)
+ def pull_request_comments
+ begin
+ @comments = @g.merge_request_comments(@project.gpid, params[:id]).reverse
+ @comments_count = @comments.count
+
+ @limit = 10
+ @is_remote = true
+ @count = @comments_count
+ @pages = Paginator.new @count, @limit, params['page'] || 1
+ @offset ||= @pages.offset
+ @comments = paginateHelper @comments, 10
+ rescue Exception => e
+ @message = e.message
+ end
+ end
+
+ # Get a list of merge request commits.
+ # Parameters:
+ # id (required) - The ID of a project
+ # merge_request_id (required) - The ID of MR
+ def pull_request_commits
+ begin
+ @type = params[:type]
+ @commits = @g.merge_request_commits(@project.gpid, params[:id])
+ @commits_count = @commits.count
+
+ @limit = 10
+ @is_remote = true
+ @count = @commits_count
+ @pages = Paginator.new @count, @limit, params['page'] || 1
+ @offset ||= @pages.offset
+ @commits = paginateHelper @commits, 10
+ rescue Exception => e
+ @message = e.message
+ end
+ end
+
+ # Shows information about the merge request including its files and changes. With GitLab 8.2 the return fields upvotes and downvotes are deprecated and always return 0.
+ # Parameters:
+ # id (required) - The ID of a project
+ # merge_request_id (required) - The ID of MR
+ def pull_request_changes
+ @type = params[:type]
+ @changes = @g.merge_request_changes(@project.gpid, params[:id]).try(:changes)
+
+ @changes_count = @changes.count
+ @limit = 10
+ @is_remote = true
+ @count = @changes_count
+ @pages = Paginator.new @count, @limit, params['page'] || 1
+ @offset ||= @pages.offset
+ @changes = paginateHelper @changes, 10
+
+ end
+
+ private
+ # post 相关操作权限控制
+ # 项目管理员可操作
+ def manager_allowed
+ unless is_project_manager?(User.current.id, @project.id)
+ return render_403
+ end
+ end
+
+ # 项目成员可操作
+ def member_allowed
+ unless User.current.member_of?(@project)
+ return render_403
+ end
+ end
+
+ def authorize_logged
+ if !User.current.logged?
+ redirect_to signin_path
+ return
+ end
+ end
+
+ def connect_gitlab
+ @g = Gitlab.client
+ end
+
+ def find_project_and_repository
+ @project = Project.find(params[:project_id])
+ render_404 if @project.gpid.blank?
+ @repository = Repository.where(:project_id => @project.id, :type => "Repository::Gitlab").first
+ rescue ActiveRecord::RecordNotFound
+ render_404
+ end
+
+end
diff --git a/app/views/pull_requests/_pull_request_changes.html.erb b/app/views/pull_requests/_pull_request_changes.html.erb
index 612fb0f53..897cb9659 100644
--- a/app/views/pull_requests/_pull_request_changes.html.erb
+++ b/app/views/pull_requests/_pull_request_changes.html.erb
@@ -1,53 +1,31 @@
-<% if !@changes.blank? && @type == "3" %>
-
-
-
改动了 <%= @changes_count %> 个文件
-
-
-
-
-
- <%= pagination_links_full @pages, @count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
-
-
-
-
+
+
改动了 <%= @changes_count %> 个文件
+
+
+
+ <%= render 'repositories/change_diff', :local => {:change => change} %>
+
+ <% end %>
+
+
+
+
+ <%= pagination_links_full @pages, @count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
+
+
+
+
+
+ <% if type == "match" %>
+
+ | <%= line_old.center(4) %> |
+ <%= last_line.center(4) %> |
+ <%= line.text %> |
+
+ <% else %>
+ <% old_line = type == 'new' ? ' '*4: line_old %>
+ <% new_line = type == 'old' ? ' '*4: last_line %>
+
+ | <%= old_line.to_s.center(4) %> |
+ <%= new_line.to_s.center(4) %> |
+ <%= line.text %> |
+
+ <% end %>
+
+
+<% end %>
\ No newline at end of file
diff --git a/app/views/repositories/commit_diff.html.erb b/app/views/repositories/commit_diff.html.erb
index cf6ff3237..d78465cdb 100644
--- a/app/views/repositories/commit_diff.html.erb
+++ b/app/views/repositories/commit_diff.html.erb
@@ -9,29 +9,14 @@
+ <%= render 'repositories/change_diff', :local => {:change => commit_diff} %>
+
<% end %>
From 896f8a2ac79a4b18e369fc2bf6426107ec25afd6 Mon Sep 17 00:00:00 2001
From: cxt 
<%= cd.new_path %>
-
- 
+