From 20bdd2366569ca077a8d1bb3f6dc21f401af8f6e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 2 Aug 2016 16:06:51 +0800
Subject: [PATCH] pull requtst show

---
 app/controllers/pull_requests_controller.rb | 3 ++-
 app/views/pull_requests/index.html.erb      | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index f44e2bc27..5f70e5771 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -9,7 +9,8 @@ class PullRequestsController < ApplicationController
   end
 
   def new
-
+    # id = params[:]
+    @request = @g.merge_request(@rpoject.gpid, id)
   end
 
   # Creates a merge request.
diff --git a/app/views/pull_requests/index.html.erb b/app/views/pull_requests/index.html.erb
index 654ffb824..ef92b0cad 100644
--- a/app/views/pull_requests/index.html.erb
+++ b/app/views/pull_requests/index.html.erb
@@ -14,10 +14,10 @@
       <% @requests.each do |request| %>
           <li>
             <% request %>
-            <a href="javascript:void(0);" class="linkGrey3 fb fl"><%= request.title %></a>
-            <a href="javascript:void(0);" class="fr fontGrey2 fb"><img src="/images/comments.png" class="mr5" width="15" />0</a><span class="fr mr15 fb fontGrey2">关闭</span>
+            <%=link_to request.title, project_pull_request_path(request.id, :project_id => @project.id), :class => "linkGrey3 fb fl"%>
+            <!--<a href="javascript:void(0);" class="fr fontGrey2 fb"><img src="/images/comments.png" class="mr5" width="15" />0</a><span class="fr mr15 fb fontGrey2">关闭</span>-->
             <div class="cl mb5"></div>
-            <span class="fontGrey2">#5 · <a href="javascript:void(0);" class="link-blue"><%= request.author.try(:username) %></a> 创建于<%= time_tag(request.created_at) %></span>
+            <span class="fontGrey2">#5 · <%= link_to request.author.try(:username), user_path(request.author), :class => "link-blue" %> 创建于<%= time_tag(request.created_at) %></span>
             <span class="fr fontGrey2"><%= time_tag(request.updated_at) %>更新</span>
             <div class="cl"></div>
           </li>