(refs #1212) GC button was finished

Fork: 0

johnpearcey / gitbucket_jkp

Browse code (refs #1212) GC button was finished master
1 parent dc98079 commit 12d11bc80cd1f3c9a5a8af41ee91ef84c20a90bd Naoki Takezoe authored on 8 Jun 2016

Patch

Unified Split

Showing 2 changed files

                Ignore Space
               Show notes
              View
            
          
          6 ■■■■■
          src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
   /**
   * Display the danger zone.
   */
  get("/:owner/:repository/settings/danger")(ownerOnly {
    html.danger(_)
    html.danger(_, flash.get("info"))
  })
 
  /**
   * Transfer repository ownership.
      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
        git.gc();
      }
    }
    redirect(s"/${repository.owner}/${repository.name}/danger")
    flash += "info" -> "Garbage collection has been executed."
    redirect(s"/${repository.owner}/${repository.name}/settings/danger")
  })
 
  /**
   * Provides duplication check for web hook url.
   /**
    * Display the danger zone.
    */
   get("/:owner/:repository/settings/danger")(ownerOnly {
+    html.danger(_)
+    html.danger(_, flash.get("info"))
   })
   /**
    * Transfer repository ownership.
       using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
         git.gc();
       }
     }
+    redirect(s"/${repository.owner}/${repository.name}/danger")
+    flash += "info" -> "Garbage collection has been executed."
+    redirect(s"/${repository.owner}/${repository.name}/settings/danger")
   })
   /**
    * Provides duplication check for web hook url.

                Ignore Space
               Show notes
              View
            
          
          3 ■■■■■
          src/main/twirl/gitbucket/core/settings/danger.scala.html
               @(repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
@(repository: gitbucket.core.service.RepositoryService.RepositoryInfo, info: Option[Any])(implicit context: gitbucket.core.controller.Context)
@import context._
@import gitbucket.core.view.helpers._
@html.main("Danger Zone", Some(repository)){
  @html.menu("settings", repository){
    @menu("danger", repository){
      @helper.html.information(info)
      <div class="panel panel-default" style="overflow: hidden;">
        <div class="panel-heading strong">Danger Zone</div>
        <div class="panel-body">
          <form id="transfer-form" method="post" action="@url(repository)/settings/transfer" validate="true" autocomplete="off">
+@(repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@(repository: gitbucket.core.service.RepositoryService.RepositoryInfo, info: Option[Any])(implicit context: gitbucket.core.controller.Context)
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main("Danger Zone", Some(repository)){
   @html.menu("settings", repository){
     @menu("danger", repository){
+      @helper.html.information(info)
       <div class="panel panel-default" style="overflow: hidden;">
         <div class="panel-heading strong">Danger Zone</div>
         <div class="panel-body">
           <form id="transfer-form" method="post" action="@url(repository)/settings/transfer" validate="true" autocomplete="off">

Show line notes below