From d956ade5e3edd3d671cfad1c0390bbf12ff64477 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Wed, 13 Apr 2016 11:43:38 +0900 Subject: [PATCH] Working for data import tool --- .../core/controller/FileUploadController.scala | 13 +++++++++++++ src/main/twirl/gitbucket/core/admin/data.scala.html | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/FileUploadController.scala b/src/main/scala/gitbucket/core/controller/FileUploadController.scala index e74f9d43e..a11aa3695 100644 --- a/src/main/scala/gitbucket/core/controller/FileUploadController.scala +++ b/src/main/scala/gitbucket/core/controller/FileUploadController.scala @@ -76,6 +76,19 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport with R } getOrElse BadRequest } + post("/import") { + session.get(Keys.Session.LoginAccount).collect { case loginAccount: Account if loginAccount.isAdmin => + execute({ (file, fileId) => + // TODO Import data here!! + println("********") + println(fileId) + println(file.getName) + println("********") + }, _ => true) + } + redirect("/admin/data") + } + private def collaboratorsOnly(owner: String, repository: String, loginAccount: Account)(action: => Any): Any = { implicit val session = Database.getSession(request) loginAccount match { diff --git a/src/main/twirl/gitbucket/core/admin/data.scala.html b/src/main/twirl/gitbucket/core/admin/data.scala.html index be7ac1332..6f5fad5ab 100644 --- a/src/main/twirl/gitbucket/core/admin/data.scala.html +++ b/src/main/twirl/gitbucket/core/admin/data.scala.html @@ -22,8 +22,8 @@
Import
-
- + +