url

src/forge/Merge/MergeItem.js

@@ -98,7 +98,7 @@ class MergeItem extends Component {
                     <span className="ml15">
                       <Tag className="pr-branch-tag">
                         <Link
-                          to={`/projects/${owner}/${ item.is_original ? item.fork_project_id : projectsId }?branch=${item.pull_request_head}`}
+                          to={`/projects/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }?branch=${item.pull_request_head}`}
                           className="maxW200px hide-1 ver-middle"
                         >
                           {item.is_original

src/forge/Merge/merge.js

@@ -407,7 +407,7 @@ class merge extends Component {
         </div>
 
         {data && data.search_count && data.search_count > 0 ? (
-          <div style={{minHeight:"400px"}}>
+          <div style={{minHeight:"470px"}}>
             <Spin spinning={isSpin}>
               <OrderItem
                 issues={issues}

src/forge/Order/MilepostDetail.js

@@ -282,7 +282,7 @@ class MilepostDetail extends Component {
             </div>
             {
               search_count > limit?
-              <div className="mt30 mb50 edu-txt-center">
+              <div className="mt30 mb10 edu-txt-center">
                 <Pagination simple current={page} total={search_count} pageSize={limit} onChange={this.ChangePage}></Pagination>
               </div>:""
             }

src/forge/Order/order.css

@@ -211,6 +211,9 @@
   padding: 6px 30px;
   cursor: pointer;
 }
+.setItemStyle{
+  min-height:440px;
+}
 .setItemStyle .issueItem{
   padding:16px 0px;
 }
@@ -221,9 +224,6 @@
   border-bottom: 1px solid #eee;
   padding: 16px 20px;
 }
-.issueItem:last-child{
-  border-bottom: none;
-}
 .issueNo {
   padding: 0px 5px;
   border-radius: 4px;

src/forge/Order/order.js

@@ -826,7 +826,7 @@ class order extends Component {
             )}
           {
             search_count > select_params.limit ?
-            <div className="mt30 mb50 edu-txt-center">
+            <div className="mt30 mb10 edu-txt-center">
               <Pagination
                 simple
                 defaultCurrent={select_params.page}