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

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.

app/views/pull_requests/index.html.erb

@@ -1,3 +1,4 @@
+<%= render "pull_request_container" %>
 <ul id="mergeBanner" class="project-merge-banner">
   <li><a href="javascript:void(0);">打开<span class="project-number-dot">1</span></a></li>
   <li><a href="javascript:void(0);">合并<span class="project-number-dot">1</span></a></li>
@@ -8,26 +9,22 @@
 </ul>
 <div class="cl"></div>
 <ul class="project-merge-content">
-  <li>
+  <% if @requests.nil? %>
-    <a href="javascript:void(0);" class="linkGrey3 fb fl">第三次提交</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>
+      <div class="no-merge-content">没有可显示的请求</div>
-    <div class="cl mb5"></div>
+  <% else %>
-    <span class="fontGrey2">#5 · <a href="javascript:void(0);" class="link-blue">Administrator</a> 创建于3小时前</span><span class="fr fontGrey2">3小时前更新</span>
+      <% @requests.each do |request| %>
-    <div class="cl"></div>
+          <li>
-  </li>
+            <% request %>
-  <li>
+            <%=link_to request.title, project_pull_request_path(request.id, :project_id => @project.id), :class => "linkGrey3 fb fl"%>
-    <a href="javascript:void(0);" class="linkGrey3 fb fl">第二次提交</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>
+            <!--<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>
+            <div class="cl mb5"></div>
-    <span class="fontGrey2">#5 · <a href="javascript:void(0);" class="link-blue">Administrator</a> 创建于3小时前</span><span class="fr fontGrey2">3小时前更新</span>
+            <span class="fontGrey2">#5 · <%= link_to request.author.try(:username), user_path(request.author), :class => "link-blue" %> 创建于<%= time_tag(request.created_at) %></span>
-    <div class="cl"></div>
+            <span class="fr fontGrey2"><%= time_tag(request.updated_at) %>更新</span>
-  </li>
+            <div class="cl"></div>
-  <li>
+          </li>
-    <a href="javascript:void(0);" class="linkGrey3 fb fl">第一次提交</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>
+      <% end %>
-    <div class="cl mb5"></div>
+  <% end %>
-    <span class="fontGrey2">#5 · <a href="javascript:void(0);" class="link-blue">Administrator</a> 创建于3小时前</span><span class="fr fontGrey2">3小时前更新</span>
-    <div class="cl"></div>
-  </li>
 </ul>
-<div class="no-merge-content">没有可显示的请求</div>
 
 <script>
     $("#mergeBanner").parent().css("width","730px");