From 7375ff9f977e273b9a1e6d8c70c82cdf831a454c Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Sat, 28 Mar 2015 17:01:41 +0900
Subject: [PATCH] (refs #677)Fix Fork button for non group users

---
 src/main/twirl/gitbucket/core/menu.scala.html | 33 ++++++++-----------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html
index 7da239aff..fa38262d3 100644
--- a/src/main/twirl/gitbucket/core/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/menu.scala.html
@@ -40,18 +40,23 @@
   @if(repository.commitCount > 0){
     <div class="pull-right">
       <div class="input-prepend">
-      @if(loginAccount.isEmpty){
-        <a title="You must be signed in to fork a repository" href="@path/signin" class="btn btn-small" style="margin-bottom: 10px;">Fork</a>
-      } else {
-        @if(isNoGroup) {
-          <a href="@path/@repository.owner/@repository.name/fork" class="btn btn-small" style="margin-bottom: 10px;" data-account="@loginAccount.get.userName">Fork</a>
+        @if(loginAccount.isEmpty){
+          <a title="You must be signed in to fork a repository" href="@path/signin" class="btn btn-small" style="margin-bottom: 10px;">Fork</a>
         } else {
-          <a href="@path/@repository.owner/@repository.name/fork" class="btn btn-small" rel="facebox" style="margin-bottom: 10px;">Fork</a>
+          @if(isNoGroup) {
+            <a id="fork-link" href="javascript:void(0);" class="btn btn-small" style="margin-bottom: 10px;">Fork</a>
+          } else {
+            <a href="@path/@repository.owner/@repository.name/fork" class="btn btn-small" rel="facebox" style="margin-bottom: 10px;">Fork</a>
+          }
         }
-      }
         <span class="add-on count"><a href="@url(repository)/network/members">@repository.forkedCount</a></span>
       </div>
     </div>
+    @if(loginAccount.isDefined && isNoGroup){
+      <form id="fork-form" method="post" action="@path/@repository.owner/@repository.name/fork">
+        <input type="hidden" name="account" value="@loginAccount.get.userName"/>
+      </form>
+    }
   }
   <div class="head">
     @helper.html.repositoryicon(repository, true)
@@ -194,19 +199,9 @@ $(function(){
   });
 
   @if(loginAccount.isDefined){
-    $(document).on("click", "a[data-account]", function(e) {
+    $(document).on("click", "a#fork-link", function(e) {
       e.preventDefault();
-      var form = $('<form/>', {
-        action: $(this).attr('href'),
-        method: "post"
-      });
-      var account = $('<input/>', {
-        type: "hidden",
-        name: "account",
-        value: $(this).data('account')
-      });
-      form.append(account);
-      form.submit();
+      $('#fork-form').submit();
     });
   }