(refs #12)Remove PARENT_USER_NAME and PARENT_REPOSITORY_NAME from GIST table

Author: takezoe

src/main/resources/update/1_3.sql

@@ -1,4 +1,2 @@
 ALTER TABLE GIST ADD COLUMN ORIGIN_USER_NAME VARCHAR(100);
 ALTER TABLE GIST ADD COLUMN ORIGIN_REPOSITORY_NAME VARCHAR(100);
-ALTER TABLE GIST ADD COLUMN PARENT_USER_NAME VARCHAR(100);
-ALTER TABLE GIST ADD COLUMN PARENT_REPOSITORY_NAME VARCHAR(100);

src/main/scala/gitbucket/gist/controller/GistController.scala

@@ -298,7 +298,7 @@ trait GistControllerBase extends ControllerBase {
         val originRepoName = gist.originRepositoryName.getOrElse(gist.repositoryName)
 
         registerGist(loginAccount.userName, repoName, gist.isPrivate, gist.title, gist.description,
-          Some(originUserName), Some(originRepoName), Some(userName), Some(repoName))
+          Some(originUserName), Some(originRepoName))
 
         // Clone repository
         JGitUtil.cloneRepository(

src/main/scala/gitbucket/gist/model/Gist.scala

@@ -16,9 +16,7 @@ trait GistComponent { self: gitbucket.core.model.Profile =>
     val updatedDate          = column[java.util.Date]("UPDATED_DATE")
     val originUserName       = column[String]("ORIGIN_USER_NAME")
     val originRepositoryName = column[String]("ORIGIN_REPOSITORY_NAME")
-    val parentUserName       = column[String]("PARENT_USER_NAME")
-    val parentRepositoryName = column[String]("PARENT_REPOSITORY_NAME")
-    def * = (userName, repositoryName, isPrivate, title, description, registeredDate, updatedDate, originUserName.?, originRepositoryName.?, parentUserName.?, parentRepositoryName.?) <> (Gist.tupled, Gist.unapply)
+    def * = (userName, repositoryName, isPrivate, title, description, registeredDate, updatedDate, originUserName.?, originRepositoryName.?) <> (Gist.tupled, Gist.unapply)
   }
 }
 
@@ -31,9 +29,7 @@ case class Gist(
   registeredDate: java.util.Date,
   updatedDate: java.util.Date,
   originUserName: Option[String],
-  originRepositoryName: Option[String],
-  parentUserName: Option[String],
-  parentRepositoryName: Option[String]
+  originRepositoryName: Option[String]
 )
 
 

src/main/scala/gitbucket/gist/service/GistService.scala

@@ -40,10 +40,9 @@ trait GistService {
     Gists.filter(t => (t.originUserName === userName.bind) && (t.originRepositoryName === repositoryName.bind)).sortBy(_.userName).list
 
   def registerGist(userName: String, repositoryName: String, isPrivate: Boolean, title: String, description: String,
-                   originUserName: Option[String] = None, originRepositoryName: Option[String] = None,
-                   parentUserName: Option[String] = None, parentRepositoryName: Option[String] = None)(implicit s: Session): Unit =
+                   originUserName: Option[String] = None, originRepositoryName: Option[String] = None)(implicit s: Session): Unit =
     Gists.insert(Gist(userName, repositoryName, isPrivate, title, description, new java.util.Date(), new java.util.Date(),
-      originUserName, originRepositoryName, parentUserName, parentRepositoryName))
+      originUserName, originRepositoryName))
 
   def updateGist(userName: String, repositoryName: String, title: String, description: String)(implicit s: Session): Unit =
     Gists

src/main/twirl/gitbucket/gist/header.scala.html

@@ -16,20 +16,19 @@
         <a href="@path/gist/@gist.userName/@gist.repositoryName/edit" class="btn btn-small">Edit</a>
         <a href="@path/gist/@gist.userName/@gist.repositoryName/delete" class="btn btn-small" id="delete">Delete</a>
       }
-      <div class="input-prepend" style="margin-bottom: 0px;">
-        @if(loginAccount.isEmpty){
-          <a title="You must be signed in to fork a repository" href="@path/signin" class="btn btn-small">Fork</a>
-        } else {
-          <a id="fork-link" href="javascript:void(0);" class="btn btn-small">Fork</a>
+      @if(gist.userName.isEmpty){
+        <div class="input-prepend" style="margin-bottom: 0px;">
+          @if(loginAccount.isEmpty){
+            <a title="You must be signed in to fork a repository" href="@path/signin" class="btn btn-small">Fork</a>
+          } else {
+            <a id="fork-link" href="javascript:void(0);" class="btn btn-small">Fork</a>
+          }
+          <span class="add-on count"><a href="@path/gist/@gist.userName/@gist.repositoryName/forks">@forkedCount</a></span>
+        </div>
+        @if(loginAccount.isDefined){
+          <form id="fork-form" method="post" action="@path/gist/@gist.userName/@gist.repositoryName/fork">
+          </form>
         }
-        <span class="add-on count"><a href="@path/gist/@gist.userName/@gist.repositoryName/forks">@forkedCount</a></span>
-      </div>
-      @if(loginAccount.isDefined){
-        <form id="fork-form" method="post" action="@path/gist/@gist.userName/@gist.repositoryName/fork">
-          @*
-          <input type="hidden" name="account" value="@loginAccount.get.userName"/>
-          *@
-        </form>
       }
     </div>
   </div>

src/main/twirl/gitbucket/gist/menu.scala.html

@@ -39,12 +39,14 @@
       dataURI("images/menu-revisions-active.png"),
       dataURI("images/menu-revisions.png"),
       "Revision")
-    @menuitem(
-      "forks",
-      s"${gist.userName}/${gist.repositoryName}/forks",
-      dataURI("images/menu-forks-active.png"),
-      dataURI("images/menu-forks.png"),
-      "Forks")
+    @if(gist.originUserName.isEmpty){
+      @menuitem(
+        "forks",
+        s"${gist.userName}/${gist.repositoryName}/forks",
+        dataURI("images/menu-forks-active.png"),
+        dataURI("images/menu-forks.png"),
+        "Forks")
+    }
     <li style="height: 12px"><div class="gradient pull-left" style="height: 12px"></div></li>
   </ul>
   <div class="small">