diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala index 9bb9ba585..0867f369c 100644 --- a/app/controllers/Application.scala +++ b/app/controllers/Application.scala @@ -422,7 +422,7 @@ final class Application @Inject()(data: DataHelper, val page = oPage.getOrElse(1) val offset = (page - 1) * pageSize - val default = LiteralColumn(1) === LiteralColumn(1) + val default = LiteralColumn(true) val logQuery = queryLog.filter { case (action) => (action.userId === userFilter).getOrElse(default) && diff --git a/app/controllers/project/Projects.scala b/app/controllers/project/Projects.scala index 25f21c5db..519f1f083 100755 --- a/app/controllers/project/Projects.scala +++ b/app/controllers/project/Projects.scala @@ -712,7 +712,7 @@ class Projects @Inject()(stats: StatTracker, (Authenticated andThen PermissionAction[AuthRequest](HardRemoveProject)).async { implicit request => getProject(author, slug).map { project => this.projects.delete(project) - UserActionLogger.log(request, LoggedAction.ProjectVisibilityChange, project.id.getOrElse(-1), "null", project.visibility.nameKey) + UserActionLogger.log(request, LoggedAction.ProjectVisibilityChange, project.id.getOrElse(-1), "deleted", project.visibility.nameKey) Redirect(ShowHome).withSuccess(request.messages.apply("project.deleted", project.name)) }.merge } @@ -733,7 +733,7 @@ class Projects @Inject()(stats: StatTracker, this.forums.changeTopicVisibility(data.project, false) - UserActionLogger.log(request.request, LoggedAction.ProjectVisibilityChange, data.project.id.getOrElse(-1), oldVisibility, data.project.visibility.nameKey) + UserActionLogger.log(request.request, LoggedAction.ProjectVisibilityChange, data.project.id.getOrElse(-1), data.project.visibility.nameKey, oldVisibility) Redirect(ShowHome).withSuccess(request.messages.apply("project.deleted", data.project.name)) } } diff --git a/app/models/user/LoggedAction.scala b/app/models/user/LoggedAction.scala index 5cc3cb5ce..22dce6687 100644 --- a/app/models/user/LoggedAction.scala +++ b/app/models/user/LoggedAction.scala @@ -74,9 +74,9 @@ case object LoggedAction extends IntEnum[LoggedAction] { case object VersionDescriptionEdited extends LoggedAction(12, "VersionDescriptionEdited", LoggedActionContext.Version, "The version description was edited") case object VersionNonReviewChanged extends LoggedAction(17, "VersionNonReviewChanged", LoggedActionContext.Version, "If the review queue skip was changed") - case object UserTaglineChanged extends LoggedAction(14, "UserTaglineChanged", LoggedActionContext.User, "The users tagline changed") - case object UserPgpKeySaved extends LoggedAction(15, "UserPgpKeySaved", LoggedActionContext.User, "The users saved a pgp public key") - case object UserPgpKeyRemoved extends LoggedAction(16, "UserPgpKeyRemoved", LoggedActionContext.User, "The users removed a pgp public key") + case object UserTaglineChanged extends LoggedAction(14, "UserTaglineChanged", LoggedActionContext.User, "The user tagline changed") + case object UserPgpKeySaved extends LoggedAction(15, "UserPgpKeySaved", LoggedActionContext.User, "The user saved a PGP Public Key") + case object UserPgpKeyRemoved extends LoggedAction(16, "UserPgpKeyRemoved", LoggedActionContext.User, "The user removed a PGP Public Key") val values: immutable.IndexedSeq[LoggedAction] = findValues }