Small fix.

2025-10-31 18:46:28 +01:00 · 2013-06-26 02:13:28 +09:00
parent e334570670
commit d75b4112d1
5 changed files with 39 additions and 37 deletions
--- a/src/main/scala/app/AccountController.scala
+++ b/src/main/scala/app/AccountController.scala
@@ -24,12 +24,12 @@ trait AccountControllerBase extends ControllerBase {
    val userName = params("userName")
    getAccountByUserName(userName).map {
      account.html.userinfo(_, getVisibleRepositories(userName, baseUrl, context.loginAccount.map(_.userName)))
-    } getOrElse NotFound()
+    } getOrElse NotFound
  }

  get("/:userName/_edit")(ownerOnly {
    val userName = params("userName")
-    getAccountByUserName(userName).map(account.html.useredit(_)) getOrElse NotFound()
+    getAccountByUserName(userName).map(account.html.useredit(_)) getOrElse NotFound
  })

  post("/:userName/_edit", form)(ownerOnly { form =>
--- a/src/main/scala/app/MilestonesController.scala
+++ b/src/main/scala/app/MilestonesController.scala
@@ -32,14 +32,14 @@ trait MilestonesControllerBase extends ControllerBase {
        getMilestoneIssueCounts(owner, repository),
        repositoryInfo,
        isWritable(owner, repository, context.loginAccount))
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

  get("/:owner/:repository/issues/milestones/new")(writableRepository {
    val owner      = params("owner")
    val repository = params("repository")

-    getRepository(owner, repository, baseUrl).map(issues.html.milestoneedit(None, _)) getOrElse NotFound()
+    getRepository(owner, repository, baseUrl).map(issues.html.milestoneedit(None, _)) getOrElse NotFound
  })

  post("/:owner/:repository/issues/milestones/new", milestoneForm)(writableRepository { form =>
@@ -56,7 +56,7 @@ trait MilestonesControllerBase extends ControllerBase {
    val milestoneId = params("milestoneId").toInt

    getRepository(owner, repository, baseUrl).map(
-      issues.html.milestoneedit(getMilestone(owner, repository, milestoneId), _)) getOrElse NotFound()
+      issues.html.milestoneedit(getMilestone(owner, repository, milestoneId), _)) getOrElse NotFound
  })

  post("/:owner/:repository/issues/milestones/:milestoneId/edit", milestoneForm)(writableRepository { form =>
@@ -67,7 +67,7 @@ trait MilestonesControllerBase extends ControllerBase {
    getMilestone(owner, repository, milestoneId).map { milestone =>
      updateMilestone(milestone.copy(title = form.title, description = form.description, dueDate = form.dueDate))
      redirect("/%s/%s/issues/milestones".format(owner, repository))
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

  get("/:owner/:repository/issues/milestones/:milestoneId/close")(writableRepository {
@@ -78,7 +78,7 @@ trait MilestonesControllerBase extends ControllerBase {
    getMilestone(owner, repository, milestoneId).map { milestone =>
      closeMilestone(milestone)
      redirect("/%s/%s/issues/milestones".format(owner, repository))
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

  get("/:owner/:repository/issues/milestones/:milestoneId/open")(writableRepository {
@@ -89,7 +89,7 @@ trait MilestonesControllerBase extends ControllerBase {
    getMilestone(owner, repository, milestoneId).map { milestone =>
      openMilestone(milestone)
      redirect("/%s/%s/issues/milestones".format(owner, repository))
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

  get("/:owner/:repository/issues/milestones/:milestoneId/delete")(writableRepository {
@@ -100,7 +100,7 @@ trait MilestonesControllerBase extends ControllerBase {
    getMilestone(owner, repository, milestoneId).map { _ =>
      deleteMilestone(owner, repository, milestoneId)
      redirect("/%s/%s/issues/milestones".format(owner, repository))
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

 }
--- a/src/main/scala/app/RepositoryViewerController.scala
+++ b/src/main/scala/app/RepositoryViewerController.scala
@@ -83,7 +83,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
          view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
        }, page, hasNext)
      }
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })
  
  /**
@@ -96,14 +96,16 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    val path       = multiParams("splat").head //.replaceFirst("^tree/.+?/", "")
    val page       = params.getOrElse("page", "1").toInt

+    getRepository(owner, repository, baseUrl).map { repositoryInfo =>
      JGitUtil.withGit(getRepositoryDir(owner, repository)){ git =>
        val (logs, hasNext) = JGitUtil.getCommitLog(git, branchName, page, 30, path)

-      repo.html.commits(path.split("/").toList, branchName, getRepository(owner, repository, baseUrl).get,
+        repo.html.commits(path.split("/").toList, branchName, repositoryInfo,
          logs.splitWith{ (commit1, commit2) =>
            view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
          }, page, hasNext)
      }
+    } getOrElse NotFound
  })

  /**
@@ -161,7 +163,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
          repo.html.blob(id, repositoryInfo, path.split("/").toList, content, new JGitUtil.CommitInfo(revCommit))
        }
      }
-    }
+    } getOrElse NotFound
  })
  
  /**
@@ -180,7 +182,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
          JGitUtil.getBranchesOfCommit(git, revCommit.getName), JGitUtil.getTagsOfCommit(git, revCommit.getName),
          repositoryInfo, JGitUtil.getDiffs(git, id))
      }
-    }
+    } getOrElse NotFound
  })
  
  /**
@@ -190,7 +192,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    val owner      = params("owner")
    val repository = params("repository")

-    repo.html.tags(getRepository(owner, repository, baseUrl).get)
+    getRepository(owner, repository, baseUrl).map(repo.html.tags(_)) getOrElse NotFound
  })
  
  /**
@@ -277,7 +279,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
          readme
        )
      }
-    }
+    } getOrElse NotFound
  }
  
 }
--- a/src/main/scala/app/SettingsController.scala
+++ b/src/main/scala/app/SettingsController.scala
@@ -43,7 +43,7 @@ trait SettingsControllerBase extends ControllerBase {
    val owner      = params("owner")
    val repository = params("repository")

-    getRepository(owner, repository, baseUrl).map(settings.html.options(_)) getOrElse NotFound()
+    getRepository(owner, repository, baseUrl).map(settings.html.options(_)) getOrElse NotFound
  })
  
  /**
@@ -67,7 +67,7 @@ trait SettingsControllerBase extends ControllerBase {
    val repository = params("repository")

    getRepository(owner, repository, baseUrl).map(
-      settings.html.collaborators(getCollaborators(owner, repository), _)) getOrElse NotFound()
+      settings.html.collaborators(getCollaborators(owner, repository), _)) getOrElse NotFound
  })

  /**
@@ -100,7 +100,7 @@ trait SettingsControllerBase extends ControllerBase {
    val owner      = params("owner")
    val repository = params("repository")

-    getRepository(owner, repository, baseUrl).map(settings.html.delete(_)) getOrElse NotFound()
+    getRepository(owner, repository, baseUrl).map(settings.html.delete(_)) getOrElse NotFound
  })

  /**
--- a/src/main/scala/app/WikiController.scala
+++ b/src/main/scala/app/WikiController.scala
@@ -35,7 +35,7 @@ trait WikiControllerBase extends ControllerBase {
      getWikiPage(owner, repository, "Home").map { page =>
        wiki.html.wiki("Home", page, repositoryInfo, isWritable(owner, repository, context.loginAccount))
      } getOrElse redirect("/%s/%s/wiki/Home/_edit".format(owner, repository))
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })
  
  get("/:owner/:repository/wiki/:page")(readableRepository {
@@ -47,7 +47,7 @@ trait WikiControllerBase extends ControllerBase {
      getWikiPage(owner, repository, pageName).map { page =>
        wiki.html.wiki(pageName, page, repositoryInfo, isWritable(owner, repository, context.loginAccount))
      } getOrElse redirect("/%s/%s/wiki/%s/_edit".format(owner, repository, pageName)) // TODO URLEncode
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })
  
  get("/:owner/:repository/wiki/:page/_history")(readableRepository {
@@ -59,7 +59,7 @@ trait WikiControllerBase extends ControllerBase {
      JGitUtil.withGit(getWikiRepositoryDir(owner, repository)){ git =>
        wiki.html.wikihistory(Some(page), JGitUtil.getCommitLog(git, "master", path = page + ".md")._1, repositoryInfo)
      }
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })
  
  get("/:owner/:repository/wiki/:page/_compare/:commitId")(readableRepository {
@@ -72,7 +72,7 @@ trait WikiControllerBase extends ControllerBase {
      JGitUtil.withGit(getWikiRepositoryDir(owner, repository)){ git =>
        wiki.html.wikicompare(Some(page), getWikiDiffs(git, commitId(0), commitId(1)), repositoryInfo)
      }
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })
  
  get("/:owner/:repository/wiki/_compare/:commitId")(readableRepository {
@@ -84,7 +84,7 @@ trait WikiControllerBase extends ControllerBase {
      JGitUtil.withGit(getWikiRepositoryDir(owner, repository)){ git =>
        wiki.html.wikicompare(None, getWikiDiffs(git, commitId(0), commitId(1)), repositoryInfo)
      }
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })
  
  get("/:owner/:repository/wiki/:page/_edit")(writableRepository {
@@ -93,7 +93,7 @@ trait WikiControllerBase extends ControllerBase {
    val page       = params("page")

    getRepository(owner, repository, baseUrl).map(
-      wiki.html.wikiedit(page, getWikiPage(owner, repository, page), _)) getOrElse NotFound()
+      wiki.html.wikiedit(page, getWikiPage(owner, repository, page), _)) getOrElse NotFound
  })
  
  post("/:owner/:repository/wiki/_edit", editForm)(writableRepository { form =>
@@ -111,7 +111,7 @@ trait WikiControllerBase extends ControllerBase {
    val owner      = params("owner")
    val repository = params("repository")

-    getRepository(owner, repository, baseUrl).map(wiki.html.wikiedit("", None, _)) getOrElse NotFound()
+    getRepository(owner, repository, baseUrl).map(wiki.html.wikiedit("", None, _)) getOrElse NotFound
  })
  
  post("/:owner/:repository/wiki/_new", newForm)(writableRepository { form =>
@@ -141,7 +141,7 @@ trait WikiControllerBase extends ControllerBase {

    getRepository(owner, repository, baseUrl).map {
      wiki.html.wikipages(getWikiPageList(owner, repository), _, isWritable(owner, repository, context.loginAccount))
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })
  
  get("/:owner/:repository/wiki/_history")(readableRepository {
@@ -152,7 +152,7 @@ trait WikiControllerBase extends ControllerBase {
      JGitUtil.withGit(getWikiRepositoryDir(owner, repository)){ git =>
        wiki.html.wikihistory(None, JGitUtil.getCommitLog(git, "master")._1, repositoryInfo)
      }
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

  get("/:owner/:repository/wiki/_blob/*")(readableRepository {
@@ -163,7 +163,7 @@ trait WikiControllerBase extends ControllerBase {
    getFileContent(owner, repository, path).map { content =>
        contentType = "application/octet-stream"
        content
-    } getOrElse NotFound()
+    } getOrElse NotFound
  })

  private def unique: Constraint = new Constraint(){