diff --git a/src/main/scala/app/SignInController.scala b/src/main/scala/app/SignInController.scala index dea995a..8e24662 100644 --- a/src/main/scala/app/SignInController.scala +++ b/src/main/scala/app/SignInController.scala @@ -42,9 +42,13 @@ session.setAttribute("LOGIN_ACCOUNT", account) updateLastLoginDate(account.userName) - session.get("REDIRECT").map { redirectUrl => + session.get("REDIRECT").map { case redirectUrl: String => session.removeAttribute("REDIRECT") - redirect(redirectUrl.asInstanceOf[String]) + if(redirectUrl.replaceFirst("/$", "") == request.getContextPath){ + redirect("/") + } else { + redirect(redirectUrl) + } }.getOrElse { redirect("/") } diff --git a/src/main/scala/service/RepositoryService.scala b/src/main/scala/service/RepositoryService.scala index 056f7df..c241b6a 100644 --- a/src/main/scala/service/RepositoryService.scala +++ b/src/main/scala/service/RepositoryService.scala @@ -47,6 +47,7 @@ Labels .filter(_.byRepository(userName, repositoryName)).delete IssueComments .filter(_.byRepository(userName, repositoryName)).delete Issues .filter(_.byRepository(userName, repositoryName)).delete + PullRequests .filter(_.byRepository(userName, repositoryName)).delete IssueId .filter(_.byRepository(userName, repositoryName)).delete Milestones .filter(_.byRepository(userName, repositoryName)).delete Repositories .filter(_.byRepository(userName, repositoryName)).delete diff --git a/src/main/twirl/helper/activities.scala.html b/src/main/twirl/helper/activities.scala.html index 395920d..15c8cdc 100644 --- a/src/main/twirl/helper/activities.scala.html +++ b/src/main/twirl/helper/activities.scala.html @@ -24,10 +24,12 @@ if(i == 3){
...
} else { -
- {commit.substring(0, 7)} - {commit.substring(41)} -
+ if(commit.nonEmpty){ +
+ {commit.substring(0, 7)} + {commit.substring(41)} +
+ } } }}