From 12ef2a5ce54d3e532aff728cdbc8f2f8c563860a Mon Sep 17 00:00:00 2001 From: Jadon Fowler Date: Sat, 6 Jan 2018 11:49:00 -0800 Subject: [PATCH 01/77] Sanatize Page & Version Names Page Names weren't being sanatized before they were displayed. An error message will occur if you attempt to create a page that is illegal. Version Names are now sanitized. Signed-off-by: Jadon Fowler --- app/assets/stylesheets/_user.scss | 6 ++++++ app/views/projects/pages/modalPageCreate.scala.html | 5 +++++ conf/messages | 1 + public/javascripts/iconUpload.js | 2 +- public/javascripts/main.js | 4 ++++ public/javascripts/pageCollapse.js | 6 ++++-- public/javascripts/pageEdit.js | 4 ++++ public/javascripts/versionList.js | 6 +++--- 8 files changed, 28 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/_user.scss b/app/assets/stylesheets/_user.scss index 582e019cf..44541c4b1 100644 --- a/app/assets/stylesheets/_user.scss +++ b/app/assets/stylesheets/_user.scss @@ -355,3 +355,9 @@ textarea[name="pgp-pub-key"] { top: -5px; left: 275px; } + +#new-page { + #new-page-label { + color: $sponge_grey; + } +} diff --git a/app/views/projects/pages/modalPageCreate.scala.html b/app/views/projects/pages/modalPageCreate.scala.html index aff4a6091..a76e892d3 100644 --- a/app/views/projects/pages/modalPageCreate.scala.html +++ b/app/views/projects/pages/modalPageCreate.scala.html @@ -14,10 +14,15 @@
+ <

@messages("page.new.title")

+
diff --git a/conf/messages b/conf/messages index ad65227fd..fb8d2b7b7 100755 --- a/conf/messages +++ b/conf/messages @@ -123,6 +123,7 @@ error.spongeauth.parse = That name is invalid, please choose a name w page.edit.cannotDeleteHomepage = Your project's homepage cannot be deleted page.edit.maxPages = You have reached the maximum amount of allowed pages. page.new.title = Create a new page +page.new.error = Error creating page page.plural = Pages project.author = Author diff --git a/public/javascripts/iconUpload.js b/public/javascripts/iconUpload.js index a7a75b97d..e3cd39b1a 100644 --- a/public/javascripts/iconUpload.js +++ b/public/javascripts/iconUpload.js @@ -33,7 +33,7 @@ var PROJECT_SLUG = null; $(function() { var form = $('#form-icon'); var btn = form.find('.btn-upload'); - var url = '/' + PROJECT_OWNER + '/' + PROJECT_SLUG + '/icon'; + var url = sanitize('/' + PROJECT_OWNER + '/' + PROJECT_SLUG + '/icon'); var preview = form.find('.user-avatar'); var input = form.find('input[type="file"]'); diff --git a/public/javascripts/main.js b/public/javascripts/main.js index e46014a74..8f62a16c7 100755 --- a/public/javascripts/main.js +++ b/public/javascripts/main.js @@ -50,6 +50,10 @@ function shouldExecuteHotkey(event) { return !event.shiftKey && !event.altKey && !event.ctrlKey && !event.metaKey; } +function sanitize(html) { + return $(' +
@messages("review.addmessage")
+
+
+
+ } + } +
+
+

@messages("review.log")

+
+ @if(reviews.isEmpty) { +
+ +
+ } + +
+ + + @for((item, index) <- reviews.reverse.zipWithIndex) { + @if(item.endedAt.isDefined) { + @if(reviews.size > (reviews.size-index)) { + @if(prettifyDateAndTime(item.endedAt.get).equalsIgnoreCase(prettifyDateAndTime(reviews.reverse((reviews.size-index-1)).createdAt.get))) { + + + + + } else { + + + + + } + } else { + @if(version.approvedAt.isDefined) { + + + + + } else { + + + + + } + } + } + @item.getMessages.filterNot(_.isTakeover).filterNot(_.isStop).reverse.map { message => + + + + + } + + + + + } + +
@prettifyDateAndTime(item.endedAt.get) + + @users.get(reviews.reverse((reviews.size-index-1)).userId).map(_.username).getOrElse("Unknown") + took over from + @users.get(item.userId).map(_.username).getOrElse("Unknown") + @if(item.getMessages.filter(_.isTakeover()).isEmpty) { + - no message provided - + } else { + @item.getMessages.filter(_.isTakeover())(0).render + } +
@prettifyDateAndTime(item.endedAt.get)@users.get(item.userId).map(_.username).getOrElse("Unknown") stopped
@prettifyDateAndTime(item.endedAt.get)@users.get(item.userId).map(_.username).getOrElse("Unknown") approved
@prettifyDateAndTime(item.endedAt.get) + @users.get(item.userId).map(_.username).getOrElse("Unknown") + stopped +
+ @if(item.getMessages.filter(_.isStop()).isEmpty) { + - no message provided - + } else { + @item.getMessages.filter(_.isStop())(0).render + } +
@message.getTime + @users.get(item.userId).map(_.username).getOrElse("Unknown") + added message +
+ @message.render +
@prettifyDateAndTime(item.createdAt.get)@users.get(item.userId).map(_.username).getOrElse("Unknown") started a review
+
+
+
+ + + + + +} diff --git a/conf/application.conf.template b/conf/application.conf.template index 469c99438..a1d532742 100755 --- a/conf/application.conf.template +++ b/conf/application.conf.template @@ -67,6 +67,7 @@ security { # Ore configuration ore { date-format = "MMM dd, yyyy" + date-and-time-format = "MMM dd, yyyy HH:mm" debug = true debug-level = 3 # Used in /admin/seed route. Run "gradle build" in OreTestPlugin before using that route @@ -116,6 +117,10 @@ ore { groupId = 64 createLimit = 5 } + + queue { + max-review-time = 86400000 // 1 day (millis) + } } mail { diff --git a/conf/evolutions/default/82.sql b/conf/evolutions/default/82.sql new file mode 100644 index 000000000..66fc68b21 --- /dev/null +++ b/conf/evolutions/default/82.sql @@ -0,0 +1,14 @@ +# --- !Ups + +CREATE TABLE project_version_reviews ( + id SERIAL PRIMARY KEY, + version_id INT NOT NULL REFERENCES project_versions ON DELETE CASCADE, + user_id INT NOT NULL REFERENCES users ON DELETE CASCADE, + created_at TIMESTAMP NOT NULL DEFAULT NOW(), + ended_at TIMESTAMP, + comment TEXT +); + +# --- !Downs + +DROP TABLE project_version_reviews; diff --git a/conf/messages b/conf/messages index 5aa8ba8b7..93d1bb691 100755 --- a/conf/messages +++ b/conf/messages @@ -272,6 +272,8 @@ user.flags.messageOwner = Message project owner user.queue = Approval queue user.queue.none = There are no versions to review. user.queue.approve = Approve +user.queue.open = Approval queue +user.queue.progress = In Review user.pgp.edit = PGP Public Key user.pgp.pubKey = PGP Public Key user.pgp.pubKey.info = Paste your PGP public key in it's entirety to the text box below. The submitted key must be associated with the email that is associated with your Sponge account. @@ -330,3 +332,13 @@ ph.comment = Comment api.deploy.versionExists = A version of that name already exists. api.deploy.invalidKey = Invalid API key. api.deploy.channelNotFound = Channel not found. + +review.title = Reviews +review.start = Start review +review.stop = Stop review +review.takeover = Takeover review +review.log = Review logs +review.whystop = Please explain why you are stopping the review +review.whytakeover = Please explain why you are takingover +review.addmessage = Add message +queue.review.none = There are no reviews in progress diff --git a/conf/routes b/conf/routes index c88df8e70..c8c441a0e 100755 --- a/conf/routes +++ b/conf/routes @@ -171,6 +171,16 @@ POST /:author/:slug/versions/:version/save @controllers POST /:author/:slug/versions/:version/recommended @controllers.project.Versions.setRecommended(author, slug, version) +# ---------- Reviews ---------- +GET /:author/:slug/versions/:version/reviews @controllers.Reviews.showReviews(author, slug, version) +POST /:author/:slug/versions/:version/reviews/init @controllers.Reviews.createReview(author, slug, version) +POST /:author/:slug/versions/:version/reviews/stop @controllers.Reviews.stopReview(author, slug, version) +POST /:author/:slug/versions/:version/reviews/approve @controllers.Reviews.approveReview(author, slug, version) +POST /:author/:slug/versions/:version/reviews/takeover @controllers.Reviews.takeoverReview(author, slug, version) +POST /:author/:slug/versions/:version/reviews/addmessage @controllers.Reviews.addMessage(author, slug, version) +POST /:author/:slug/versions/:version/reviews/edit/:review @controllers.Reviews.editReview(author, slug, version, review: Int) + + # ---------- Other ---------- GET /assets/*file controllers.Assets.at(path="/public", file) diff --git a/public/javascripts/review.js b/public/javascripts/review.js new file mode 100644 index 000000000..12f3dc402 --- /dev/null +++ b/public/javascripts/review.js @@ -0,0 +1,133 @@ +/* + * ================================================== + * _____ _ + * | |___ ___ |_|___ + * | | | _| -_|_ | |_ -| + * |_____|_| |___|_|_| |___| + * |___| + * + * (C) SpongePowered 2018 MIT License + * https://github.com/SpongePowered/Ore + * + * Powers the admin reviews. + * + * ================================================== + */ + + +/* + * ================================================== + * = Doc ready = + * ================================================== + */ + +$(function() { + $('.btn-review-start').click(function() { + var icon = $(this).find('i').removeClass('fa-terminal').addClass('fa-spinner fa-spin'); + $(this).attr("disabled", "disabled"); + $.ajax({ + type: 'post', + url: '/' + versionPath + '/reviews/init', + data: { csrfToken: csrf }, + complete: function() { icon.removeClass('fa-spinner fa-spin').addClass('fa-terminal'); }, + success: function() { + location.reload(); + } + }); + }); + + $('.btn-review-stop').click(function () { + var modal = $('#modal-review-stop'); + modal.modal().show(); + modal.on('shown.bs.modal', function() { $(this).find('textarea').focus(); }); + }); + + $('.btn-review-stop-submit').click(function() { + var icon = $(this).find('i').removeClass('fa-times-circle-o').addClass('fa-spinner fa-spin'); + $.ajax({ + type: 'post', + url: '/' + versionPath + '/reviews/stop', + + data: { csrfToken: csrf, content: $('.textarea-stop').val() }, + complete: function() { icon.removeClass('fa-spinner fa-spin').addClass('fa-times-circle-o'); }, + success: function() { + location.reload(); + } + }); + }); + + $('.btn-review-approve').click(function() { + var icon = $(this).find('i').removeClass('fa-thumbs-up').addClass('fa-spinner fa-spin'); + $.ajax({ + type: 'post', + url: '/' + versionPath + '/reviews/approve', + data: { csrfToken: csrf } + }); + $.ajax({ + type: 'post', + url: '/' + versionPath + '/approve', + data: { csrfToken: csrf }, + success: function() { + location.reload(); + } + }); + }); + + $('.btn-review-takeover').click(function () { + var modal = $('#modal-review-takeover'); + modal.modal().show(); + modal.on('shown.bs.modal', function() { $(this).find('textarea').focus(); }); + }); + + $('.btn-review-takeover-submit').click(function() { + var icon = $(this).find('i').removeClass('fa-clipboard').addClass('fa-spinner fa-spin'); + $.ajax({ + type: 'post', + url: '/' + versionPath + '/reviews/takeover', + data: { csrfToken: csrf, content: $('.textarea-takeover').val() }, + success: function() { + location.reload(); + } + }); + }); + + $('.btn-edit-message').click(function () { + var panel = $(this).parent().parent().parent(); + var text = panel.find('textarea'); + text.attr('disabled', null); + $(this).hide(); + panel.find('.btn-cancel-message').show(); + panel.find('.btn-save-message').show(); + }); + + $('.btn-cancel-message').click(function(){ + location.reload(); + }); + + $('.btn-save-message').click(function() { + var panel = $(this).parent().parent().parent(); + var textarea = panel.find('textarea'); + textarea.attr('disabled', 'disabled'); + $(this).find('i').removeClass('fa-save').addClass('fa-spinner fa-spin'); + $.ajax({ + type: 'post', + url: '/' + versionPath + '/reviews/edit/' + panel.data('review'), + data: { csrfToken: csrf, content: textarea.val() }, + success: function() { + location.reload(); + } + }); + }); + + $('.btn-review-addmessage-submit').click(function() { + var icon = $(this).find('i').removeClass('fa-clipboard').addClass('fa-spinner fa-spin'); + $.ajax({ + type: 'post', + url: '/' + versionPath + '/reviews/addmessage', + data: { csrfToken: csrf, content: $('.textarea-addmessage').val() }, + success: function() { + location.reload(); + } + }); + }); +}); From 46782fcbf1e2c5bc05e5aff3395340f726884722 Mon Sep 17 00:00:00 2001 From: Jadon Fowler Date: Tue, 16 Jan 2018 11:50:46 -0800 Subject: [PATCH 14/77] Fix version & channel deletion Files.deleteIfExists will throw a DirectoryNotEmptyException if the directory it is trying to delete is not empty. FileUtils has a function to delete directories that we can use. Closes #361 Signed-off-by: Jadon Fowler --- app/db/impl/access/ProjectBase.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/db/impl/access/ProjectBase.scala b/app/db/impl/access/ProjectBase.scala index 66ea3b0b2..72d4f7c29 100644 --- a/app/db/impl/access/ProjectBase.scala +++ b/app/db/impl/access/ProjectBase.scala @@ -151,7 +151,7 @@ class ProjectBase(override val service: ModelService, channel.versions.all.foreach { version: Version => val versionFolder = this.fileManager.getVersionDir(project.ownerName, project.name, version.name) - Files.deleteIfExists(versionFolder) + FileUtils.deleteDirectory(versionFolder) version.remove() } } @@ -181,7 +181,7 @@ class ProjectBase(override val service: ModelService, this.deleteChannel(channel) val versionDir = this.fileManager.getVersionDir(proj.ownerName, project.name, version.name) - Files.deleteIfExists(versionDir) + FileUtils.deleteDirectory(versionDir) } /** From 28a2e8bf9d241d38db43151d765bf1da496b9e3d Mon Sep 17 00:00:00 2001 From: Jadon Fowler Date: Tue, 16 Jan 2018 12:17:54 -0800 Subject: [PATCH 15/77] Give Organization Admins their own Trust Level Org Owners & Admins had the same Trust Level. Owners couldn't modify Admin positions because they had Absolute Trust. They are now ordered correctly, and Admins can modify the positions of everyone except the Owner. Closes #364 Closes #365 Signed-off-by: Jadon Fowler --- app/ore/permission/Permission.scala | 8 ++++---- app/ore/permission/role/RoleTypes.scala | 2 +- app/ore/permission/role/Trust.scala | 7 ++++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/ore/permission/Permission.scala b/app/ore/permission/Permission.scala index 24823b6e1..b64dc3fe6 100644 --- a/app/ore/permission/Permission.scala +++ b/app/ore/permission/Permission.scala @@ -1,6 +1,6 @@ package ore.permission -import ore.permission.role.{Absolute, Limited, Standard, Trust} +import ore.permission.role._ /** * Represents a permission for a user to do something in the application. @@ -8,7 +8,7 @@ import ore.permission.role.{Absolute, Limited, Standard, Trust} sealed trait Permission { def trust: Trust } case object EditChannels extends Permission { val trust = Standard } case object EditPages extends Permission { val trust = Limited } -case object EditSettings extends Permission { val trust = Absolute } +case object EditSettings extends Permission { val trust = Lifted } case object EditVersions extends Permission { val trust = Standard } case object HideProjects extends Permission { val trust = Standard } case object ReviewFlags extends Permission { val trust = Standard } @@ -18,6 +18,6 @@ case object ViewLogs extends Permission { val trust = Standard } case object ResetOre extends Permission { val trust = Absolute } case object SeedOre extends Permission { val trust = Absolute } case object MigrateOre extends Permission { val trust = Absolute } -case object CreateProject extends Permission { val trust = Absolute } +case object CreateProject extends Permission { val trust = Lifted } case object PostAsOrganization extends Permission { val trust = Standard } -case object EditApiKeys extends Permission { val trust = Absolute } +case object EditApiKeys extends Permission { val trust = Lifted } diff --git a/app/ore/permission/role/RoleTypes.scala b/app/ore/permission/role/RoleTypes.scala index 74e5a1e22..198efac89 100644 --- a/app/ore/permission/role/RoleTypes.scala +++ b/app/ore/permission/role/RoleTypes.scala @@ -48,7 +48,7 @@ object RoleTypes extends Enumeration { isAssignable = false) val OrganizationOwner = new RoleType(22, -5, classOf[OrganizationRole], Absolute, "Owner", Purple, isAssignable = false) - val OrganizationAdmin = new RoleType(26, -9, classOf[OrganizationRole], Absolute, "Admin", Purple) + val OrganizationAdmin = new RoleType(26, -9, classOf[OrganizationRole], Lifted, "Admin", Purple) val OrganizationDev = new RoleType(23, -6, classOf[OrganizationRole], Standard, "Developer", Transparent) val OrganizationEditor = new RoleType(24, -7, classOf[OrganizationRole], Limited, "Editor", Transparent) val OrganizationSupport = new RoleType(25, -8, classOf[OrganizationRole], Default, "Support", Transparent) diff --git a/app/ore/permission/role/Trust.scala b/app/ore/permission/role/Trust.scala index 99a39eff5..fba857582 100644 --- a/app/ore/permission/role/Trust.scala +++ b/app/ore/permission/role/Trust.scala @@ -25,7 +25,12 @@ case object Limited extends Trust { override val level = 1 } */ case object Standard extends Trust { override val level = 2 } +/** + * User that can perform any action but they are not on top. + */ +case object Lifted extends Trust { override val level = 3 } + /** * User is absolutely trusted and may perform any action. */ -case object Absolute extends Trust { override val level = 3 } +case object Absolute extends Trust { override val level = 4 } From 08656acbc1a3c858501935fbed0aa0b446d2856a Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Wed, 17 Jan 2018 19:10:39 +0100 Subject: [PATCH 16/77] Add resolved_at & resolved_by to a flag and make comment non-optional --- app/controllers/Application.scala | 2 +- app/controllers/project/Projects.scala | 2 +- app/db/impl/schema.scala | 4 +++- app/db/impl/table/ModelKeys.scala | 2 ++ app/form/OreForms.scala | 2 +- app/form/project/FlagForm.scala | 2 +- app/models/project/Flag.scala | 14 ++++++++++++-- app/views/projects/view.scala.html | 2 +- conf/evolutions/default/83.sql | 19 +++++++++++++++++++ conf/messages | 1 + 10 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 conf/evolutions/default/83.sql diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala index a792d3835..27ad85558 100755 --- a/app/controllers/Application.scala +++ b/app/controllers/Application.scala @@ -137,7 +137,7 @@ final class Application @Inject()(data: DataHelper, case None => notFound case Some(flag) => - flag.setResolved(resolved) + flag.setResolved(resolved, users.current) Ok } } diff --git a/app/controllers/project/Projects.scala b/app/controllers/project/Projects.scala index 90c2e3095..16d733fc3 100755 --- a/app/controllers/project/Projects.scala +++ b/app/controllers/project/Projects.scala @@ -289,7 +289,7 @@ class Projects @Inject()(stats: StatTracker, hasErrors => FormError(ShowProject(project), hasErrors), formData => { - project.flagFor(user, formData.reason, formData.comment.orNull) + project.flagFor(user, formData.reason, formData.comment) Redirect(self.show(author, slug)).flashing("reported" -> "true") } ) diff --git a/app/db/impl/schema.scala b/app/db/impl/schema.scala index 4d3f277e0..393a2e973 100755 --- a/app/db/impl/schema.scala +++ b/app/db/impl/schema.scala @@ -336,8 +336,10 @@ class FlagTable(tag: RowTag) extends ModelTable[Flag](tag, "project_flags") { def reason = column[FlagReason]("reason") def comment = column[String]("comment") def isResolved = column[Boolean]("is_resolved") + def resolvedAt = column[Timestamp]("resolved_at") + def resolvedBy = column[Int]("resolved_by") - override def * = (id.?, createdAt.?, projectId, userId, reason, comment, isResolved) <> (Flag.tupled, Flag.unapply) + override def * = (id.?, createdAt.?, projectId, userId, reason, comment, isResolved, resolvedAt.?, resolvedBy.?) <> (Flag.tupled, Flag.unapply) } diff --git a/app/db/impl/table/ModelKeys.scala b/app/db/impl/table/ModelKeys.scala index 509b7ab52..ea6c8289f 100755 --- a/app/db/impl/table/ModelKeys.scala +++ b/app/db/impl/table/ModelKeys.scala @@ -92,6 +92,8 @@ object ModelKeys { // Flag val IsResolved = new BooleanKey[Flag](_.isResolved, _.isResolved) + val ResolvedAt = new TimestampKey[Flag](_.resolvedAt, _.resolvedAt.orNull) + val ResolvedBy = new IntKey[Flag](_.resolvedBy, _.resolvedBy.getOrElse(-1)) // StatEntry val UserId = new IntKey[StatEntry[_]](_.userId, _.user.flatMap(_.id).getOrElse(-1)) diff --git a/app/form/OreForms.scala b/app/form/OreForms.scala index 9b1ac73cc..4de42c749 100755 --- a/app/form/OreForms.scala +++ b/app/form/OreForms.scala @@ -61,7 +61,7 @@ class OreForms @Inject()(implicit config: OreConfig, factory: ProjectFactory, se */ lazy val ProjectFlag = Form(mapping( "flag-reason" -> number, - "comment" -> optional(nonEmptyText)) + "comment" -> nonEmptyText) (FlagForm.apply)(FlagForm.unapply)) /** diff --git a/app/form/project/FlagForm.scala b/app/form/project/FlagForm.scala index 2f727730c..1083c9a69 100644 --- a/app/form/project/FlagForm.scala +++ b/app/form/project/FlagForm.scala @@ -3,7 +3,7 @@ package form.project import ore.project.FlagReasons import ore.project.FlagReasons.FlagReason -case class FlagForm(reasonId: Int, comment: Option[String]) { +case class FlagForm(reasonId: Int, comment: String) { val reason: FlagReason = FlagReasons.values.find(_.id == reasonId).getOrElse(FlagReasons.Other) diff --git a/app/models/project/Flag.scala b/app/models/project/Flag.scala index e7e03750d..358b1e07f 100644 --- a/app/models/project/Flag.scala +++ b/app/models/project/Flag.scala @@ -1,10 +1,12 @@ package models.project import java.sql.Timestamp +import java.time.Instant import db.impl.FlagTable import db.impl.model.OreModel import db.impl.table.ModelKeys._ +import models.user.User import ore.permission.scope.ProjectScope import ore.project.FlagReasons.FlagReason import ore.user.UserOwned @@ -25,7 +27,9 @@ case class Flag(override val id: Option[Int], override val userId: Int, reason: FlagReason, comment: String, - private var _isResolved: Boolean = false) + private var _isResolved: Boolean = false, + var resolvedAt: Option[Timestamp] = None, + var resolvedBy: Option[Int] = None) extends OreModel(id, createdAt) with UserOwned with ProjectScope { @@ -50,9 +54,15 @@ case class Flag(override val id: Option[Int], * * @param resolved True if resolved */ - def setResolved(resolved: Boolean) = Defined { + def setResolved(resolved: Boolean, user: Option[User]) = Defined { this._isResolved = resolved update(IsResolved) + if (resolved) { + this.resolvedAt = Some(Timestamp.from(Instant.now)) + update(ResolvedAt) + this.resolvedBy = Some(user.flatMap(_.id).getOrElse(-1)) + update(ResolvedBy) + } } override def copyWith(id: Option[Int], theTime: Option[Timestamp]) = this.copy(id = id, createdAt = theTime) diff --git a/app/views/projects/view.scala.html b/app/views/projects/view.scala.html index 0742f19f9..4c9baec7b 100755 --- a/app/views/projects/view.scala.html +++ b/app/views/projects/view.scala.html @@ -180,7 +180,7 @@ }
diff --git a/conf/evolutions/default/83.sql b/conf/evolutions/default/83.sql new file mode 100644 index 000000000..5c6f6edd1 --- /dev/null +++ b/conf/evolutions/default/83.sql @@ -0,0 +1,19 @@ +# --- !Ups + +ALTER TABLE project_flags ADD COLUMN resolved_at timestamp; +ALTER TABLE project_flags ADD COLUMN resolved_by int; + +UPDATE project_flags + SET resolved_at = created_at + WHERE is_resolved=true +UPDATE project_flags + SET resolved_by = -1 + WHERE is_resolved=true +UPDATE project_flags + SET comment = '' + WHERE comment IS NULL + +# --- !Downs + +ALTER TABLE project_flags DROP COLUMN resolved_at; +ALTER TABLE project_flags DROP COLUMN resolved_by; diff --git a/conf/messages b/conf/messages index 93d1bb691..a322cfe70 100755 --- a/conf/messages +++ b/conf/messages @@ -98,6 +98,7 @@ error.ore.timeout.title = Ore took too long to respond. error.ore.timeout.body = Whoops! We couldn't respond to your request in a timely manner, this could be because a service Ore uses is currently unavailable or the servers are just overloaded. Please try again later. error.notFound.title = 404 Not Found error.notFound.message = The URI "{0}" could not be found +error.required.comment = A comment is required error.plugin.fileExtension = Plugin file must be either a JAR or ZIP file. error.plugin.sig.fileExtension = Signature file must be either a SIG or ASC file. From acedd8743b06750f4c4829a2eb5eaa9adab8bfbd Mon Sep 17 00:00:00 2001 From: simon816 Date: Fri, 19 Jan 2018 02:24:34 +0000 Subject: [PATCH 17/77] Fix evolution SQL --- conf/evolutions/default/83.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/evolutions/default/83.sql b/conf/evolutions/default/83.sql index 5c6f6edd1..1918d0169 100644 --- a/conf/evolutions/default/83.sql +++ b/conf/evolutions/default/83.sql @@ -5,13 +5,13 @@ ALTER TABLE project_flags ADD COLUMN resolved_by int; UPDATE project_flags SET resolved_at = created_at - WHERE is_resolved=true + WHERE is_resolved=true; UPDATE project_flags SET resolved_by = -1 - WHERE is_resolved=true + WHERE is_resolved=true; UPDATE project_flags SET comment = '' - WHERE comment IS NULL + WHERE comment IS NULL; # --- !Downs From d199fc0f894f756f82d67f54b940a1748c7300a1 Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Fri, 19 Jan 2018 14:34:23 +0100 Subject: [PATCH 18/77] Show roles in authors --- app/db/impl/access/UserBase.scala | 2 ++ app/views/users/authors.scala.html | 25 ++++++++++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/app/db/impl/access/UserBase.scala b/app/db/impl/access/UserBase.scala index 48e4d0c42..e99dd3899 100755 --- a/app/db/impl/access/UserBase.scala +++ b/app/db/impl/access/UserBase.scala @@ -66,6 +66,7 @@ class UserBase(override val service: ModelService, case ORDERING_PROJECTS => users = users.sortBy(u => (u.projects.size, u.username)) case ORDERING_JOIN_DATE => users = users.sortBy(u => (u.joinDate.getOrElse(u.createdAt.get), u.username)) case ORDERING_USERNAME => users = users.sortBy(_.username) + case ORDERING_ROLE => users = users.sortBy(_.globalRoles.toList.sortBy(_.trust).headOption.map(_.trust.level).getOrElse(-1)) case _ => users.sortBy(u => (u.projects.size, u.username)) } @@ -137,5 +138,6 @@ object UserBase { val ORDERING_PROJECTS = "projects" val ORDERING_USERNAME = "username" val ORDERING_JOIN_DATE = "joined" + val ORDERING_ROLE = "roles" } diff --git a/app/views/users/authors.scala.html b/app/views/users/authors.scala.html index 9bbf6d323..b51415b40 100755 --- a/app/views/users/authors.scala.html +++ b/app/views/users/authors.scala.html @@ -3,6 +3,7 @@ @import db.impl.access.{ProjectBase, UserBase} @import models.user.User @import ore.OreConfig +@import ore.permission.role.GlobalRole @import security.NonceFilter._ @import util.StringUtils._ @(authors: Seq[User], ordering: String, page: Int)(implicit messages: Messages, request: Request[_], @@ -32,6 +33,10 @@ Username @if(isActiveSort(ORDERING_USERNAME)) { } + + Roles + @if(isActiveSort(ORDERING_ROLE)) { } + Joined @if(isActiveSort(ORDERING_JOIN_DATE)) { } @@ -48,13 +53,23 @@ @utils.userAvatar(user, clazz = "user-avatar-xs") @user.username + + @defining(user.donorType) { donorType => - @donorType.map { dt => - - @dt.title - - } + @donorType.map { dt => + + @dt.title + + } + } + @defining(user.globalRoles.toList.filterNot(user.donorType.contains(_)).sortBy(_.trust).reverse.lastOption) { roleType => + @roleType.map { role => + + @role.title + + } } + @prettifyDate(user.joinDate.getOrElse(user.createdAt.get)) @user.projects.size From e56e6510113cc7918fb497842d1b2bd7a82f3459 Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Sat, 20 Jan 2018 17:09:38 +0100 Subject: [PATCH 19/77] Fix for #360 --- app/assets/stylesheets/main.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 422f7f473..9774d00d6 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -211,6 +211,9 @@ form { &.selected { box-shadow: inset -10px 0px 0px 0px $sponge_yellow; } + &.selected td:nth-child(2) { + box-shadow: inset -10px 0px $sponge_yellow; + } } } From 2dd72c972abbf5ec28aa7a58c8c718c04e33caac Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Fri, 19 Jan 2018 21:24:56 +0100 Subject: [PATCH 20/77] Add staff activity overview --- app/controllers/Application.scala | 41 +++++++++++++ app/ore/permission/Permission.scala | 1 + app/views/users/admin/activity.scala.html | 74 +++++++++++++++++++++++ app/views/users/view.scala.html | 9 +++ conf/messages | 1 + conf/routes | 1 + 6 files changed, 127 insertions(+) create mode 100644 app/views/users/admin/activity.scala.html diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala index 27ad85558..e26e27733 100755 --- a/app/controllers/Application.scala +++ b/app/controllers/Application.scala @@ -1,5 +1,7 @@ package controllers +import java.sql.Timestamp +import java.time.Instant import javax.inject.Inject import controllers.sugar.Bakery @@ -7,6 +9,7 @@ import controllers.sugar.Requests.AuthRequest import db.impl.OrePostgresDriver.api._ import db.impl.schema.ProjectSchema import db.{ModelFilter, ModelService} +import models.admin.Review import models.project.{Flag, Project, Version} import ore.Platforms.Platform import ore.permission._ @@ -186,4 +189,42 @@ final class Application @Inject()(data: DataHelper, Redirect(ShowHome) } + /** + * Show the activities page for a user + */ + def showActivities(user: String) = (Authenticated andThen PermissionAction[AuthRequest](ReviewProjects)) { implicit request => + val u = this.users.withName(user).get + var activities: Seq[(Object, Option[Project])] = Seq.empty + if (u.id.isDefined) { + val reviews: Seq[(Review, Option[Project])] = this.service.access[Review](classOf[Review]) + .filter(_.userId === u.id.get) + .take(20) + .map(review => review -> this.projects.find(_.id === this.service.access[Version](classOf[Version]).filter(_.id === review.versionId).head.projectId)) + val flags: Seq[(Flag, Option[Project])] = this.service.access[Flag](classOf[Flag]) + .filter(_.resolvedBy === u.id.get) + .take(20) + .map(flag => flag -> this.projects.find(_.id === flag.projectId)) + activities = reviews ++ flags + activities.sortWith(sortActivities) + } + Ok(views.users.admin.activity(u, activities)) + } + + /** + * Compares 2 activities (supply a [[Review]] or [[Flag]]) to decide which came first + * @param o1 Review / Flag + * @param o2 Review / Flag + * @return Boolean + */ + def sortActivities(o1: Object, o2: Object): Boolean = { + var o1Time: Long = 0 + var o2Time: Long = 0 + if (o1.isInstanceOf[Review]) { + o1Time = o1.asInstanceOf[Review].endedAt.getOrElse(Timestamp.from(Instant.EPOCH)).getTime + } + if (o2.isInstanceOf[Flag]) { + o2Time = o2.asInstanceOf[Flag].resolvedAt.getOrElse(Timestamp.from(Instant.EPOCH)).getTime + } + return o1Time > o2Time + } } diff --git a/app/ore/permission/Permission.scala b/app/ore/permission/Permission.scala index b64dc3fe6..38c1974cc 100644 --- a/app/ore/permission/Permission.scala +++ b/app/ore/permission/Permission.scala @@ -21,3 +21,4 @@ case object MigrateOre extends Permission { val trust = Absolute } case object CreateProject extends Permission { val trust = Lifted } case object PostAsOrganization extends Permission { val trust = Standard } case object EditApiKeys extends Permission { val trust = Lifted } +case object ViewActivity extends Permission { val trust = Standard } diff --git a/app/views/users/admin/activity.scala.html b/app/views/users/admin/activity.scala.html new file mode 100644 index 000000000..bbae7f6f5 --- /dev/null +++ b/app/views/users/admin/activity.scala.html @@ -0,0 +1,74 @@ +@import db.ModelService +@import db.impl.access.UserBase +@import java.sql.Timestamp +@import ore.OreConfig +@import models.project.{Project, Version} +@import models.admin.Review +@import util.StringUtils._ +@import security.NonceFilter._ +@import models.user.User + +@import models.project.Flag + +@import java.time.Instant +@(user: User, activities: Seq[(Object, Option[Project])])(implicit messages: Messages, request: Request[_], service: ModelService, config: OreConfig, users: UserBase) + +@bootstrap.layout(messages("activity.title") + user.username) { + +
+
+
+
+

@messages("activity.title") @user.username

+
+
+
+
+
+
+
+

@messages("activity.title")

+
+
+ + + @if(activities.isEmpty) { + + } + @activities.map { tuple => + @if(tuple._1.isInstanceOf[Review]) { + + + + + + } + @if(tuple._1.isInstanceOf[Flag]) { + + + + + + } + } + +
No activities founds
Review approved:@prettifyDateAndTime(tuple._1.asInstanceOf[Review].endedAt.getOrElse(Timestamp.from(Instant.EPOCH)))for: + @if(tuple._2.isDefined) { + + @tuple._2.get.ownerName / @tuple._2.get.name + + } + @{println(tuple._2)} +
Flag resolved:@prettifyDateAndTime(tuple._1.asInstanceOf[Flag].resolvedAt.getOrElse(Timestamp.from(Instant.EPOCH)))for: + @if(tuple._2.isDefined) { + + @tuple._2.get.ownerName / @tuple._2.get.name + + } + @{println(tuple._2)} +
+
+
+
+
+} diff --git a/app/views/users/view.scala.html b/app/views/users/view.scala.html index c35739ba6..8723cddaf 100755 --- a/app/views/users/view.scala.html +++ b/app/views/users/view.scala.html @@ -4,6 +4,7 @@ @import models.user.User @import ore.OreConfig @import ore.permission.EditSettings +@import ore.permission.{ViewActivity, ReviewFlags, ReviewProjects} @import ore.user.Prompts @import security.NonceFilter._ @import util.StringUtils._ @@ -110,6 +111,14 @@

data-placement="top" title="@messages("user.pgp.pubKey")"> } + @if(users.current.get can ViewActivity in user) { + @if((user can ReviewFlags in user) || (user can ReviewProjects in user)) { + + } + }

diff --git a/conf/messages b/conf/messages index a322cfe70..3f8bf278a 100755 --- a/conf/messages +++ b/conf/messages @@ -343,3 +343,4 @@ review.whystop = Please explain why you are stopping the review review.whytakeover = Please explain why you are takingover review.addmessage = Add message queue.review.none = There are no reviews in progress +activity.title = Activity: diff --git a/conf/routes b/conf/routes index c8c441a0e..83ec66206 100755 --- a/conf/routes +++ b/conf/routes @@ -11,6 +11,7 @@ GET /admin/queue @controllers GET /admin/flags @controllers.Application.showFlags() GET /admin/flags/:id/resolve/:resolved @controllers.Application.setFlagResolved(id: Int, resolved: Boolean) GET /admin/health @controllers.Application.showHealth() +GET /admin/activities/:user @controllers.Application.showActivities(user: String) GET /statusz @controllers.ApiController.showStatusZ() From 8c75868bccd2a315b965aa9d7f1e349902aeb848 Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Sun, 21 Jan 2018 14:43:51 +0100 Subject: [PATCH 21/77] Update slick dependencies --- build.sbt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 2f00df65c..e0d962ab3 100755 --- a/build.sbt +++ b/build.sbt @@ -22,10 +22,10 @@ resolvers ++= Seq( libraryDependencies ++= Seq( "org.spongepowered" % "play-discourse" % "1.0.0-SNAPSHOT", "org.spongepowered" % "plugin-meta" % "0.4.1", - "com.typesafe.play" %% "play-slick" % "2.0.2", - "com.typesafe.play" %% "play-slick-evolutions" % "2.0.2", + "com.typesafe.play" %% "play-slick" % "2.1.0", + "com.typesafe.play" %% "play-slick-evolutions" % "2.1.0", "org.postgresql" % "postgresql" % "9.4.1212.jre7", - "com.github.tminglei" %% "slick-pg" % "0.12.0", + "com.github.tminglei" %% "slick-pg" % "0.15.5", "com.getsentry.raven" % "raven-logback" % "7.2.2", "org.bouncycastle" % "bcprov-jdk15on" % "1.56", "org.bouncycastle" % "bcpkix-jdk15on" % "1.56", From 105e6eacc637a20c5ec4b23f0db565180f304b57 Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Sat, 20 Jan 2018 15:34:20 +0100 Subject: [PATCH 22/77] Add stats page --- app/controllers/Application.scala | 43 +++++++++ app/ore/permission/Permission.scala | 1 + app/views/users/admin/stats.scala.html | 128 +++++++++++++++++++++++++ conf/routes | 1 + 4 files changed, 173 insertions(+) create mode 100644 app/views/users/admin/stats.scala.html diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala index e26e27733..758db6bd6 100755 --- a/app/controllers/Application.scala +++ b/app/controllers/Application.scala @@ -23,6 +23,8 @@ import security.spauth.SingleSignOnConsumer import util.DataHelper import views.{html => views} +import scala.concurrent.Future + /** * Main entry point for application. */ @@ -227,4 +229,45 @@ final class Application @Inject()(data: DataHelper, } return o1Time > o2Time } + /** + * Show stats + * @return + */ + def showStats() = (Authenticated andThen PermissionAction[AuthRequest](ViewStats)) { implicit request => + + /** + * Query to get a count where columnDate is equal to the date + */ + def last10DaysCountQuery(table: String, columnDate: String): Seq[(String,String)] = { + val query = this.service.DB.db.run(sql""" + SELECT + (SELECT COUNT(*) FROM #$table WHERE CAST(#$columnDate AS DATE) = day), + CAST(day AS DATE) + FROM (SELECT current_date - (INTERVAL '1 day' * generate_series(0, 9)) AS day) dates + ORDER BY day ASC""".as[(String, String)]) + this.service.await(query).getOrElse(Seq()) + } + + /** + * Query to get a count of open record in last 10 days + */ + def last10DaysTotalOpen(table: String, columnStartDate: String, columnEndDate: String): Seq[(String,String)] = { + val query = this.service.DB.db.run(sql""" + SELECT + (SELECT COUNT(*) FROM #$table WHERE CAST(#$columnStartDate AS DATE) <= date.when AND (CAST(#$columnEndDate AS DATE) >= date.when OR #$columnEndDate IS NULL)) count, + CAST(date.when AS DATE) AS days + FROM (SELECT current_date - (INTERVAL '1 day' * generate_series(0, 9)) AS when) date + ORDER BY days ASC""".as[(String, String)]) + this.service.await(query).getOrElse(Seq()) + } + + val reviews: Seq[(String, String)] = last10DaysCountQuery("project_version_reviews", "ended_at") + val uploads: Seq[(String, String)] = last10DaysCountQuery("project_versions", "created_at") + val totalDownloads: Seq[(String, String)] = last10DaysCountQuery("project_version_downloads", "created_at") + val unsafeDownloads: Seq[(String, String)] = last10DaysCountQuery("project_version_unsafe_downloads", "created_at") + val flagsOpen: Seq[(String, String)] = last10DaysTotalOpen("project_flags", "created_at", "resolved_at") + val flagsClosed: Seq[(String, String)] = last10DaysCountQuery("project_flags", "resolved_at") + + Ok(views.users.admin.stats(reviews, uploads, totalDownloads, unsafeDownloads, flagsOpen, flagsClosed)) + } } diff --git a/app/ore/permission/Permission.scala b/app/ore/permission/Permission.scala index 38c1974cc..1c5e60c62 100644 --- a/app/ore/permission/Permission.scala +++ b/app/ore/permission/Permission.scala @@ -22,3 +22,4 @@ case object CreateProject extends Permission { val trust = Lifted } case object PostAsOrganization extends Permission { val trust = Standard } case object EditApiKeys extends Permission { val trust = Lifted } case object ViewActivity extends Permission { val trust = Standard } +case object ViewStats extends Permission { val trust = Standard } diff --git a/app/views/users/admin/stats.scala.html b/app/views/users/admin/stats.scala.html new file mode 100644 index 000000000..caf021435 --- /dev/null +++ b/app/views/users/admin/stats.scala.html @@ -0,0 +1,128 @@ +@import db.ModelService +@import db.impl.access.UserBase +@import ore.OreConfig +@import security.NonceFilter._ + +@import play.api.libs.json.Json +@(reviews: Seq[(String, String)], uploads: Seq[(String, String)], totalDownloads: Seq[(String, String)], + unsafeDownloads: Seq[(String, String)], flagsOpen: Seq[(String, String)], flagsClosed: Seq[(String, String)])(implicit messages: Messages, + request: Request[_], service: ModelService, config: OreConfig, users: UserBase) + +@bootstrap.layout("Stats") { +
+
+
+
+
+

Plugins

+
+
+ +
+
+
+
+
+

Downloads

+
+
+ +
+
+
+
+
+

Flags

+
+
+ +
+
+
+
+ + +} diff --git a/conf/routes b/conf/routes index 83ec66206..884335772 100755 --- a/conf/routes +++ b/conf/routes @@ -12,6 +12,7 @@ GET /admin/flags @controllers GET /admin/flags/:id/resolve/:resolved @controllers.Application.setFlagResolved(id: Int, resolved: Boolean) GET /admin/health @controllers.Application.showHealth() GET /admin/activities/:user @controllers.Application.showActivities(user: String) +GET /admin/stats @controllers.Application.showStats() GET /statusz @controllers.ApiController.showStatusZ() From 15b9bdd7aacd7b153edb83af3b7dd4ed5f1c1d71 Mon Sep 17 00:00:00 2001 From: simon816 Date: Fri, 19 Jan 2018 02:45:11 +0000 Subject: [PATCH 23/77] Basic frontend layout for user administration --- app/controllers/Application.scala | 11 ++ app/ore/permission/Permission.scala | 2 + app/ore/user/MembershipDossier.scala | 5 +- app/views/users/admin/userAdmin.scala.html | 129 +++++++++++++++++++++ app/views/users/view.scala.html | 10 +- conf/routes | 3 + 6 files changed, 157 insertions(+), 3 deletions(-) mode change 100755 => 100644 app/controllers/Application.scala create mode 100644 app/views/users/admin/userAdmin.scala.html mode change 100755 => 100644 app/views/users/view.scala.html diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala old mode 100755 new mode 100644 index 758db6bd6..8103a0805 --- a/app/controllers/Application.scala +++ b/app/controllers/Application.scala @@ -270,4 +270,15 @@ final class Application @Inject()(data: DataHelper, Ok(views.users.admin.stats(reviews, uploads, totalDownloads, unsafeDownloads, flagsOpen, flagsClosed)) } + + def AdminAction = Authenticated andThen PermissionAction[AuthRequest](ViewAdmin) + + def userAdmin(user: String) = AdminAction { implicit request => + this.users.withName(user).map { u => + Ok(views.users.admin.userAdmin(u)) + } getOrElse { + notFound + } + } + } diff --git a/app/ore/permission/Permission.scala b/app/ore/permission/Permission.scala index 1c5e60c62..d829df67f 100644 --- a/app/ore/permission/Permission.scala +++ b/app/ore/permission/Permission.scala @@ -23,3 +23,5 @@ case object PostAsOrganization extends Permission { val trust = Standard } case object EditApiKeys extends Permission { val trust = Lifted } case object ViewActivity extends Permission { val trust = Standard } case object ViewStats extends Permission { val trust = Standard } +// TODO: Finer admin permissions +case object ViewAdmin extends Permission { val trust = Absolute } diff --git a/app/ore/user/MembershipDossier.scala b/app/ore/user/MembershipDossier.scala index 4482bf729..245941e70 100644 --- a/app/ore/user/MembershipDossier.scala +++ b/app/ore/user/MembershipDossier.scala @@ -29,9 +29,10 @@ trait MembershipDossier { implicit def convertModel(model: ModelType): this.model.M = model.asInstanceOf[this.model.M] + def roles: ModelAccess[RoleType] = this.model.schema.getChildren[RoleType](this.roleClass, this.model) + private def association = this.model.schema.getAssociation[MembersTable, User](this.membersTableClass, this.model) - private def roles: ModelAccess[RoleType] = this.model.schema.getChildren[RoleType](this.roleClass, this.model) private def roleAccess: ModelAccess[RoleType] = this.model.service.access[RoleType](roleClass) private def addMember(user: User) = this.association.add(user) @@ -52,7 +53,7 @@ trait MembershipDossier { * @return All members */ def members: Set[MemberType] = { - this.model.schema.getAssociation[MembersTable, User](this.membersTableClass, this.model).all.map { user => + this.association.all.map { user => newMember(user.id.get) } } diff --git a/app/views/users/admin/userAdmin.scala.html b/app/views/users/admin/userAdmin.scala.html new file mode 100644 index 000000000..5616103d5 --- /dev/null +++ b/app/views/users/admin/userAdmin.scala.html @@ -0,0 +1,129 @@ +@import db.ModelService +@import db.impl.access.{UserBase, ProjectBase, OrganizationBase} +@import models.user.User +@import models.user.role.{OrganizationRole, ProjectRole, RoleModel} +@import ore.permission.role.{RoleTypes, GlobalRole} +@import ore.{OreConfig, OreEnv} + +@(user: User)(implicit messages: Messages, request: Request[_], service: ModelService, + config: OreConfig, users: UserBase, projects: ProjectBase, organizations: OrganizationBase) + +@isOrg = @{user.isOrganization} + +@orgRoles = @{RoleTypes.values.filter(r => r.roleClass == classOf[OrganizationRole] && r.roleId != 64)} +@projectRoles = @{RoleTypes.values.filter(_.roleClass == classOf[ProjectRole])} +@globalRoles = @{RoleTypes.values.filter(_.roleClass == classOf[GlobalRole])} + + +@panel(title: String, size: Int = 9)(content: Html) = { +
+
+
+

@title

+
+ @content +
+
+} + +@roleTable[M <: RoleModel](keyName: String, roles: Set[M], roleTypes: Set[RoleTypes.Value])(showKey: M => Html) = { + + + @for(role <- roles) { + + + + + + + } + + + +
@keyNameRoleAccepted
@showKey(role)
+ +
+} + +@bootstrap.layout((if(isOrg) "Organization" else "User") + " Admin - " + user.username) { + +
+
+
+

@{(if(isOrg) "Organization" else "User") + " Admin - "}@user.username

+
+
+ +
+ @if(!isOrg) { + @panel("Organizations") { + @roleTable("Organization", user.organizationRoles.all, orgRoles) { role => + + @role.organization.username + + } + } + } else { + @panel("Members") { + @roleTable("User", user.toOrganization.memberships.roles.all, orgRoles) { role => + + @role.user.username + + } + } + } + @panel("Other Administration", size=3) { +
+
+ SpongeAuth Admin +
+
+ Forum Profile +
+
+ } +
+ @if(!isOrg) { +
+ @panel("Projects") { + @roleTable("Project", user.projectRoles.all, projectRoles) { role => + + @role.project.name + + } + } +
+ } +
+ @panel("Global Roles") { +
+ @for(role <- user.globalRoles) { +
+ @role.title + + + +
+ } +
+ + +
+
+ } +
+
+ +} diff --git a/app/views/users/view.scala.html b/app/views/users/view.scala.html old mode 100755 new mode 100644 index 8723cddaf..6dff7353e --- a/app/views/users/view.scala.html +++ b/app/views/users/view.scala.html @@ -4,7 +4,7 @@ @import models.user.User @import ore.OreConfig @import ore.permission.EditSettings -@import ore.permission.{ViewActivity, ReviewFlags, ReviewProjects} +@import ore.permission.{ViewActivity, ReviewFlags, ReviewProjects, EditSettings, ViewAdmin} @import ore.user.Prompts @import security.NonceFilter._ @import util.StringUtils._ @@ -111,6 +111,7 @@

data-placement="top" title="@messages("user.pgp.pubKey")"> } + @if(users.current.get can ViewActivity in user) { @if((user can ReviewFlags in user) || (user can ReviewProjects in user)) {

} } + + @if(users.current.isDefined && users.current.get.can(ViewAdmin).in(user)) { + + }

diff --git a/conf/routes b/conf/routes index 884335772..73dfb5ec2 100755 --- a/conf/routes +++ b/conf/routes @@ -4,6 +4,9 @@ GET /*path/ @controllers.Application.removeTrail(path) +# ---------- Admin ---------- + +GET /admin/user/:user @controllers.Application.userAdmin(user) #GET /admin/reset @controllers.Application.reset() GET /admin/seed @controllers.Application.seed(users: Int ?= 200, projects: Int ?= 1, versions: Int ?= 2, channels: Int ?= 2) #GET /admin/migrate @controllers.Application.migrate() From a6d9a205dccf8d5b82b8b2335c2356e6f70910c7 Mon Sep 17 00:00:00 2001 From: simon816 Date: Sun, 21 Jan 2018 00:43:02 +0000 Subject: [PATCH 24/77] Implement backend for user admin --- app/controllers/Application.scala | 82 ++++++++++++++- app/db/impl/table/ModelKeys.scala | 5 +- app/form/OreForms.scala | 6 ++ app/models/project/Project.scala | 9 ++ app/models/user/Organization.scala | 28 ++++- app/ore/Joinable.scala | 5 + app/ore/permission/Permission.scala | 3 +- app/views/users/admin/userAdmin.scala.html | 109 +++++++++++--------- app/views/users/view.scala.html | 6 +- conf/routes | 1 + public/javascripts/userAdmin.js | 113 +++++++++++++++++++++ 11 files changed, 311 insertions(+), 56 deletions(-) create mode 100644 public/javascripts/userAdmin.js diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala index 8103a0805..650480065 100644 --- a/app/controllers/Application.scala +++ b/app/controllers/Application.scala @@ -6,13 +6,17 @@ import javax.inject.Inject import controllers.sugar.Bakery import controllers.sugar.Requests.AuthRequest +import db.access.ModelAccess import db.impl.OrePostgresDriver.api._ import db.impl.schema.ProjectSchema import db.{ModelFilter, ModelService} +import form.OreForms import models.admin.Review import models.project.{Flag, Project, Version} +import models.user.role._ import ore.Platforms.Platform import ore.permission._ +import ore.permission.role.{RoleTypes, GlobalRole, Role} import ore.permission.scope.GlobalScope import ore.project.Categories.Category import ore.project.{Categories, ProjectSortingStrategies} @@ -29,6 +33,7 @@ import scala.concurrent.Future * Main entry point for application. */ final class Application @Inject()(data: DataHelper, + forms: OreForms, implicit override val bakery: Bakery, implicit override val sso: SingleSignOnConsumer, implicit override val messagesApi: MessagesApi, @@ -271,9 +276,9 @@ final class Application @Inject()(data: DataHelper, Ok(views.users.admin.stats(reviews, uploads, totalDownloads, unsafeDownloads, flagsOpen, flagsClosed)) } - def AdminAction = Authenticated andThen PermissionAction[AuthRequest](ViewAdmin) + def UserAdminAction = Authenticated andThen PermissionAction[AuthRequest](UserAdmin) - def userAdmin(user: String) = AdminAction { implicit request => + def userAdmin(user: String) = UserAdminAction { implicit request => this.users.withName(user).map { u => Ok(views.users.admin.userAdmin(u)) } getOrElse { @@ -281,4 +286,77 @@ final class Application @Inject()(data: DataHelper, } } + def updateUser(user: String) = UserAdminAction { implicit request => + this.users.withName(user).map { user => + this.forms.UserAdminUpdate.bindFromRequest.fold( + hasErrors => BadRequest, + { case (thing, action, data) => + + import play.api.libs.json._ + val json = Json.parse(data) + + def updateRoleTable[M <: RoleModel](modelAccess: ModelAccess[M], allowedType: Class[_ <: Role], ownerType: RoleTypes.RoleType, transferOwner: M => Unit) = { + val id = (json \ "id").as[Int] + action match { + case "setRole" => modelAccess.get(id).map { role => + val roleType = RoleTypes.withId((json \ "role").as[Int]) + if (roleType == ownerType) { + transferOwner(role) + Ok + } else if (roleType.roleClass == allowedType && roleType.isAssignable) { + role.roleType = roleType + Ok + } else BadRequest + } getOrElse BadRequest + case "setAccepted" => modelAccess.get(id).map { role => + role.setAccepted((json \ "accepted").as[Boolean]) + Ok + } getOrElse BadRequest + case "deleteRole" => modelAccess.get(id).map { role => + if (role.roleType.isAssignable) { + role.remove() + Ok + } else BadRequest + } getOrElse BadRequest + } + } + + def transferOrgOwner(r: OrganizationRole) = r.organization.transferOwner(r.organization.memberships.newMember(r.userId)) + + thing match { + + case "globalRole" => + val role = RoleTypes.withId((json \ "role").as[Int]) + if (role.roleClass != classOf[GlobalRole] || !role.isAssignable) { + BadRequest + } else action match { + case "add" => user.globalRoles += role + Ok + case "remove" => user.globalRoles -= role + Ok + } + + case "orgRole" => + if (user.isOrganization) { + BadRequest + } else updateRoleTable(user.organizationRoles, classOf[OrganizationRole], RoleTypes.OrganizationOwner, transferOrgOwner) + case "memberRole" => + if (!user.isOrganization) { + BadRequest + } else updateRoleTable(user.toOrganization.memberships.roles, classOf[OrganizationRole], RoleTypes.OrganizationOwner, transferOrgOwner) + case "projectRole" => + if (user.isOrganization) { + BadRequest + } else updateRoleTable(user.projectRoles, classOf[ProjectRole], RoleTypes.ProjectOwner, + (r:ProjectRole) => r.project.transferOwner(r.project.memberships.newMember(r.userId))) + + case _ => BadRequest + } + + }) + } getOrElse { + notFound + } + } + } diff --git a/app/db/impl/table/ModelKeys.scala b/app/db/impl/table/ModelKeys.scala index ea6c8289f..da530b98c 100755 --- a/app/db/impl/table/ModelKeys.scala +++ b/app/db/impl/table/ModelKeys.scala @@ -8,7 +8,7 @@ import models.admin.{ProjectLogEntry, Review} import models.project._ import models.statistic.StatEntry import models.user.role.RoleModel -import models.user.{Notification, SignOn, User} +import models.user.{Notification, SignOn, User, Organization} import ore.Colors.Color import ore.permission.role.RoleTypes.RoleType import ore.project.Categories.Category @@ -61,6 +61,9 @@ object ModelKeys { val AvatarUrl = new StringKey[User](_.avatarUrl, _.avatarUrl.orNull) val ReadPrompts = new Key[User, List[Prompt]](_.readPrompts, _.readPrompts.toList) + // Organization + val OrgOwnerId = new IntKey[Organization](_.userId, _.owner.userId) + // SignOn val IsCompleted = new BooleanKey[SignOn](_.isCompleted, _.isCompleted) diff --git a/app/form/OreForms.scala b/app/form/OreForms.scala index 4de42c749..4fc66a9b4 100755 --- a/app/form/OreForms.scala +++ b/app/form/OreForms.scala @@ -220,4 +220,10 @@ class OreForms @Inject()(implicit config: OreConfig, factory: ProjectFactory, se lazy val ReviewDescription = Form(single("content" -> text)) + + lazy val UserAdminUpdate = Form(tuple( + "thing" -> text, + "action" -> text, + "data" -> text + )) } diff --git a/app/models/project/Project.scala b/app/models/project/Project.scala index 3cd0d83f0..29d2f886f 100755 --- a/app/models/project/Project.scala +++ b/app/models/project/Project.scala @@ -17,6 +17,7 @@ import models.api.ProjectApiKey import models.statistic.ProjectView import models.user.User import models.user.role.ProjectRole +import ore.permission.role.RoleTypes import ore.permission.scope.ProjectScope import ore.project.Categories.Category import ore.project.FlagReasons.FlagReason @@ -122,6 +123,14 @@ case class Project(override val id: Option[Int] = None, */ override def owner: ProjectMember = new ProjectMember(this, this.ownerId) + override def transferOwner(member: ProjectMember) { + // Down-grade current owner to "Developer" + this.memberships.getRoles(this.owner.user).filter(_.roleType == RoleTypes.ProjectOwner) + .foreach(_.roleType = RoleTypes.ProjectDev); + this.memberships.getRoles(member.user).foreach(_.roleType = RoleTypes.ProjectOwner); + this.owner = member.user; + } + /** * Sets the [[User]] that owns this Project. * diff --git a/app/models/user/Organization.scala b/app/models/user/Organization.scala index 347e3e1f3..956b9152c 100644 --- a/app/models/user/Organization.scala +++ b/app/models/user/Organization.scala @@ -2,12 +2,15 @@ package models.user import java.sql.Timestamp +import com.google.common.base.Preconditions._ import db.impl.access.UserBase import db.impl.model.OreModel import db.impl.{OrganizationMembersTable, OrganizationRoleTable, OrganizationTable} +import db.impl.table.ModelKeys._ import db.{Model, Named} import models.user.role.OrganizationRole import ore.organization.OrganizationMember +import ore.permission.role.RoleTypes import ore.permission.scope.OrganizationScope import ore.user.{MembershipDossier, UserOwned} import ore.{Joinable, Visitable} @@ -25,7 +28,7 @@ import ore.{Joinable, Visitable} case class Organization(override val id: Option[Int] = None, override val createdAt: Option[Timestamp] = None, username: String, - ownerId: Int) + private var ownerId: Int) extends OreModel(id, createdAt) with UserOwned with OrganizationScope @@ -62,6 +65,29 @@ case class Organization(override val id: Option[Int] = None, */ override def owner: OrganizationMember = new OrganizationMember(this, this.ownerId) + override def transferOwner(member: OrganizationMember) { + // Down-grade current owner to "Admin" + this.memberships.getRoles(this.owner.user).filter(_.roleType == RoleTypes.OrganizationOwner) + .foreach(_.roleType = RoleTypes.OrganizationAdmin); + this.memberships.getRoles(member.user).foreach(_.roleType = RoleTypes.OrganizationOwner); + this.owner = member.user; + } + + + /** + * Sets the [[User]] that owns this Organization. + * + * @param user User that owns this organization + */ + def owner_=(user: User) = { + checkNotNull(user, "null user", "") + checkArgument(user.isDefined, "undefined user", "") + this.ownerId = user.id.get + if (isDefined) { + update(OrgOwnerId) + } + } + /** * Returns this Organization as a [[User]]. * diff --git a/app/ore/Joinable.scala b/app/ore/Joinable.scala index 897011d7a..38d5edfc8 100644 --- a/app/ore/Joinable.scala +++ b/app/ore/Joinable.scala @@ -16,6 +16,11 @@ trait Joinable[M <: Member[_ <: RoleModel]] extends ScopeSubject { */ def owner: M + /** + * Transfers ownership of this object to the given member. + */ + def transferOwner(owner: M) + /** * Returns this objects membership information. * diff --git a/app/ore/permission/Permission.scala b/app/ore/permission/Permission.scala index d829df67f..11eaf37b6 100644 --- a/app/ore/permission/Permission.scala +++ b/app/ore/permission/Permission.scala @@ -15,6 +15,7 @@ case object ReviewFlags extends Permission { val trust = Standard } case object ReviewProjects extends Permission { val trust = Standard } case object ViewHealth extends Permission { val trust = Standard } case object ViewLogs extends Permission { val trust = Standard } +case object UserAdmin extends Permission { val trust = Standard } case object ResetOre extends Permission { val trust = Absolute } case object SeedOre extends Permission { val trust = Absolute } case object MigrateOre extends Permission { val trust = Absolute } @@ -23,5 +24,3 @@ case object PostAsOrganization extends Permission { val trust = Standard } case object EditApiKeys extends Permission { val trust = Lifted } case object ViewActivity extends Permission { val trust = Standard } case object ViewStats extends Permission { val trust = Standard } -// TODO: Finer admin permissions -case object ViewAdmin extends Permission { val trust = Absolute } diff --git a/app/views/users/admin/userAdmin.scala.html b/app/views/users/admin/userAdmin.scala.html index 5616103d5..b464d3912 100644 --- a/app/views/users/admin/userAdmin.scala.html +++ b/app/views/users/admin/userAdmin.scala.html @@ -9,13 +9,13 @@ config: OreConfig, users: UserBase, projects: ProjectBase, organizations: OrganizationBase) @isOrg = @{user.isOrganization} +@prefix = @{"Edit " + (if(isOrg) "Organization" else "User") + " - "} -@orgRoles = @{RoleTypes.values.filter(r => r.roleClass == classOf[OrganizationRole] && r.roleId != 64)} -@projectRoles = @{RoleTypes.values.filter(_.roleClass == classOf[ProjectRole])} -@globalRoles = @{RoleTypes.values.filter(_.roleClass == classOf[GlobalRole])} +@orgRoles = @{RoleTypes.values.filter(r => r.roleClass == classOf[OrganizationRole] && (r.isAssignable || r == RoleTypes.OrganizationOwner))} +@projectRoles = @{RoleTypes.values.filter(r => r.roleClass == classOf[ProjectRole] && (r.isAssignable || r == RoleTypes.ProjectOwner))} +@globalRoles = @{RoleTypes.values.filter(r => r.roleClass == classOf[GlobalRole] && r.isAssignable)} - -@panel(title: String, size: Int = 9)(content: Html) = { +@panel(title: String, size: Int = 12)(content: Html) = {
@@ -26,44 +26,52 @@

@title

} -@roleTable[M <: RoleModel](keyName: String, roles: Set[M], roleTypes: Set[RoleTypes.Value])(showKey: M => Html) = { - - +@roleTable[M <: RoleModel](keyName: String, tableType: String, getOwner: M => User, roles: Set[M], roleTypes: Set[RoleTypes.Value])(showKey: M => Html) = { +
@keyNameRoleAccepted
+ @if(getOwner != null) {} @for(role <- roles) { - + - - - + @if(getOwner != null) { + + } + @if(!role.roleType.isAssignable) { + + } else { + + + + } } - - -
@keyNameOwnerRoleAccepted
@showKey(role)@{getOwner(role).username} + @role.roleType.title +
- -
} -@bootstrap.layout((if(isOrg) "Organization" else "User") + " Admin - " + user.username) { +@bootstrap.layout(prefix + user.username) { + +
-

@{(if(isOrg) "Organization" else "User") + " Admin - "}@user.username

+

@prefix@user.username

+
+
+
@if(!isOrg) { @panel("Organizations") { - @roleTable("Organization", user.organizationRoles.all, orgRoles) { role => + @roleTable[OrganizationRole]("Organization", "orgRole", _.organization.owner, user.organizationRoles.all, orgRoles) { role => @role.organization.username @@ -71,28 +79,18 @@

@{(if(isOrg) "Organization" else "User") + " Admin - "} + @roleTable[OrganizationRole]("User", "memberRole", null, user.toOrganization.memberships.roles.all, orgRoles) { role => @role.user.username } } } - @panel("Other Administration", size=3) { -
-
- SpongeAuth Admin -
-
- Forum Profile -
-
- }

@if(!isOrg) {
@panel("Projects") { - @roleTable("Project", user.projectRoles.all, projectRoles) { role => + @roleTable[ProjectRole]("Project", "projectRole", _.project.owner, user.projectRoles.all, projectRoles) { role => @role.project.name @@ -102,28 +100,45 @@

@{(if(isOrg) "Organization" else "User") + " Admin - "} @panel("Global Roles") { -
+
@for(role <- user.globalRoles) { -
+
@role.title - - - + @if(role.isAssignable) { + + + + }
}
- + @for(roleType <- globalRoles.filter(r => !user.globalRoles.contains(r))) { + } -
}
+ +
+ + @panel("Other Administration", size=3) { +
+
+ SpongeAuth Profile +
+
+ Forum Profile +
+
+ } + +

} diff --git a/app/views/users/view.scala.html b/app/views/users/view.scala.html index 6dff7353e..a819b35f4 100644 --- a/app/views/users/view.scala.html +++ b/app/views/users/view.scala.html @@ -3,8 +3,8 @@ @import db.impl.access.UserBase @import models.user.User @import ore.OreConfig -@import ore.permission.EditSettings -@import ore.permission.{ViewActivity, ReviewFlags, ReviewProjects, EditSettings, ViewAdmin} +@import ore.permission.{ViewActivity, ReviewFlags, ReviewProjects, EditSettings, UserAdmin} +@import ore.permission.scope.GlobalScope @import ore.user.Prompts @import security.NonceFilter._ @import util.StringUtils._ @@ -121,7 +121,7 @@

} } - @if(users.current.isDefined && users.current.get.can(ViewAdmin).in(user)) { + @if(users.current.isDefined && (users.current.get can UserAdmin in GlobalScope)) { ')); + newItem.insertBefore(globalRoleList.children().last()); + // Remove from select + selected.remove(); + }) + .always(finishLoading); + + }); + + globalRoleList.on('click', '.global-role-delete', function(event) { + event.preventDefault(); + var item = $(event.target).closest('.list-group-item'); + + var finishLoading = loadingButton($(event.target).parent()); + + var role = parseInt(item.data('role')); + var title = item.text(); + + update('globalRole', 'remove', { role: role }) + .done(function () { + var option = $(''); + option.text(title); + option.val(role); + globalRoleSelect.append(option); + item.remove(); + }) + .fail(finishLoading); + }); + + function rowChange(action, data, element) { + element.disabled = true; + var row = $(element).closest('tr'); + var id = parseInt(row.data('role-id')); + var type = row.data('role-type'); + return update(type, action, $.extend({ id: id }, data)) + .always(function () { + element.disabled = false; + }); + } + + var roleTables = $('.role-table'); + + roleTables.on('change', '.select-role', function(event) { + rowChange('setRole', { role: parseInt(event.target.value) }, event.target) + .fail(function () { + event.target.selectedIndex = event.target.defaultValue; + }) + .done(function () { + event.target.defaultValue = event.target.selectedIndex; + if ($('option:selected', event.target).data('refresh')) { + history.go(0) + } + }); + }); + + roleTables.find('.select-role').each(function (i, element) { + element.defaultValue = element.selectedIndex; + }); + + roleTables.on('change', '.role-accepted', function(event) { + rowChange('setAccepted', { accepted: event.target.checked }, event.target) + .fail(function () { + event.target.checked = !event.target.checked; + }); + }); + roleTables.on('click', '.delete-role', function(event) { + event.preventDefault(); + var row = $(event.target).closest('tr'); + rowChange('deleteRole', {}, event.target) + .done(row.remove); + }); +}); From 3bb8a7e0b5fb7da8567c648596e4fc60a1e8300e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Kleinekath=C3=B6fer?= Date: Mon, 29 Jan 2018 13:06:02 +0100 Subject: [PATCH 25/77] Fix to remove slick deprecation warnings --- app/db/ModelService.scala | 6 +++--- app/db/impl/OrePostgresDriver.scala | 2 +- app/db/impl/service/OreModelService.scala | 3 +-- conf/application.conf.template | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/db/ModelService.scala b/app/db/ModelService.scala index af41dcce1..e89171278 100644 --- a/app/db/ModelService.scala +++ b/app/db/ModelService.scala @@ -8,8 +8,8 @@ import db.ModelFilter.IdFilter import db.access.ModelAccess import db.table.{MappedType, ModelTable} import slick.ast.{AnonSymbol, Ref, SortBy} -import slick.backend.DatabaseConfig -import slick.driver.{JdbcDriver, JdbcProfile} +import slick.basic.DatabaseConfig +import slick.jdbc.JdbcProfile import slick.jdbc.JdbcType import slick.lifted.{ColumnOrdered, WrappingQuery} import slick.util.ConstArray @@ -31,7 +31,7 @@ trait ModelService { val registry: ModelRegistry /** The base JDBC driver */ - val driver: JdbcDriver + val driver: JdbcProfile import driver.api._ /** diff --git a/app/db/impl/OrePostgresDriver.scala b/app/db/impl/OrePostgresDriver.scala index 0e3f54c87..9b4ec99c7 100644 --- a/app/db/impl/OrePostgresDriver.scala +++ b/app/db/impl/OrePostgresDriver.scala @@ -23,7 +23,7 @@ import ore.user.notification.NotificationTypes.NotificationType /** * Custom Postgres driver to support array data and custom type mappings. */ -trait OrePostgresDriver extends ExPostgresDriver with PgArraySupport with PgNetSupport { +trait OrePostgresDriver extends ExPostgresProfile with PgArraySupport with PgNetSupport { override val api = OreDriver diff --git a/app/db/impl/service/OreModelService.scala b/app/db/impl/service/OreModelService.scala index 1c9ae3f2d..cf88096b8 100644 --- a/app/db/impl/service/OreModelService.scala +++ b/app/db/impl/service/OreModelService.scala @@ -2,7 +2,6 @@ package db.impl.service import javax.inject.{Inject, Singleton} -import db.impl.OrePostgresDriver.api._ import db.impl.{OreModelProcessor, OrePostgresDriver} import db.{ModelRegistry, ModelService} import discourse.OreDiscourseApi @@ -10,7 +9,7 @@ import ore.{OreConfig, OreEnv} import play.api.db.slick.DatabaseConfigProvider import play.api.i18n.MessagesApi import security.spauth.SpongeAuthApi -import slick.driver.JdbcProfile +import slick.jdbc.JdbcProfile import scala.concurrent.duration._ diff --git a/conf/application.conf.template b/conf/application.conf.template index a1d532742..93b7dd582 100755 --- a/conf/application.conf.template +++ b/conf/application.conf.template @@ -155,7 +155,7 @@ mail { # Slick configuration slick.dbs.default { - driver = "slick.driver.PostgresDriver$" + profile = "slick.jdbc.PostgresProfile$" db { driver = "org.postgresql.Driver" url = "jdbc:postgresql://localhost/ore" From fff6621339dff332058b967f637842c84aa09daf Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Sun, 28 Jan 2018 19:25:39 +0100 Subject: [PATCH 26/77] Fix notification screen and add notification when plugin is approved --- app/controllers/Reviews.scala | 26 +++ app/ore/project/NotifyWatchersTask.scala | 2 +- .../user/notification/NotificationTypes.scala | 1 + app/views/users/notifications.scala.html | 165 +++++++++--------- conf/messages | 1 + 5 files changed, 116 insertions(+), 79 deletions(-) diff --git a/app/controllers/Reviews.scala b/app/controllers/Reviews.scala index 7e6122997..68e99fb7a 100644 --- a/app/controllers/Reviews.scala +++ b/app/controllers/Reviews.scala @@ -11,7 +11,10 @@ import db.ModelService import db.impl.{ReviewTable, VersionTable} import form.OreForms import models.admin.{Message, Review} +import models.user.{Notification, User} import ore.permission.ReviewProjects +import ore.permission.role.Lifted +import ore.user.notification.NotificationTypes import ore.{OreConfig, OreEnv} import play.api.i18n.MessagesApi import security.spauth.SingleSignOnConsumer @@ -73,6 +76,29 @@ final class Reviews @Inject()(data: DataHelper, withVersion(versionString) { version => val review = version.mostRecentUnfinishedReview.get review.setEnded(Timestamp.from(Instant.now())) + + // send notification that review happened + val organization = this.organizations.get(project.ownerId) + + if (organization.isDefined) { + val users: List[User] = organization.get.memberships.members.toList.filter(_.headRole.roleType.trust.level >= Lifted.level).map(_.user) + + if (!users.contains(version.author.get)) + users :+ version.author.get + + users.foreach(user => user.sendNotification(Notification( + originId = request.user.id.get, + notificationType = NotificationTypes.ProjectInvite, + message = messagesApi("notification.project.reviewed", slug, versionString) + ))) + } else { + version.author.get.sendNotification(Notification( + originId = request.user.id.get, + notificationType = NotificationTypes.ProjectInvite, + message = messagesApi("notification.project.reviewed", slug, versionString) + )) + } + Redirect(routes.Reviews.showReviews(author, slug, versionString)) } } diff --git a/app/ore/project/NotifyWatchersTask.scala b/app/ore/project/NotifyWatchersTask.scala index 3528efa6d..dba0406a3 100644 --- a/app/ore/project/NotifyWatchersTask.scala +++ b/app/ore/project/NotifyWatchersTask.scala @@ -26,7 +26,7 @@ case class NotifyWatchersTask(version: Version, messages: MessagesApi)(implicit message = messages("notification.project.newVersion", project.name, version.name), action = Some(version.url) ) - for (watcher <- project.watchers.all) + for (watcher <- project.watchers.all.filterNot(_.userId == version.author.get.userId)) watcher.sendNotification(notification) } diff --git a/app/ore/user/notification/NotificationTypes.scala b/app/ore/user/notification/NotificationTypes.scala index 3165169c7..f3062bd4a 100644 --- a/app/ore/user/notification/NotificationTypes.scala +++ b/app/ore/user/notification/NotificationTypes.scala @@ -14,6 +14,7 @@ object NotificationTypes extends Enumeration { val ProjectInvite = NotificationType(0) val OrganizationInvite = NotificationType(1) val NewProjectVersion = NotificationType(2) + val VersionReviewed = NotificationType(3) case class NotificationType(i: Int) extends super.Val(i) with MappedType[NotificationType] { implicit val mapper: JdbcType[NotificationType] = OrePostgresDriver.api.notificationTypeTypeMapper diff --git a/app/views/users/notifications.scala.html b/app/views/users/notifications.scala.html index 39f71c0c5..b813e4966 100755 --- a/app/views/users/notifications.scala.html +++ b/app/views/users/notifications.scala.html @@ -30,84 +30,92 @@
- -
-
-

@messages("notification.plural")

-
-
- - - @if(notifications.nonEmpty && notificationFilter.equals(NotificationFilters.Unread)) { - - } +
+ +
+
+
+

@messages("notification.plural")

+
+
+ + + @if(notifications.nonEmpty && notificationFilter.equals(NotificationFilters.Unread)) { + + } +
+
-
-
- -

@messages("notification.invites")

- -
-
-
- -
- + +
+
+ -
    - @notifications.map { notification => -
  • +
      + @notifications.map { notification => +
    • - @utils.userAvatar(notification.origin, clazz = "user-avatar-s") - @notification.message + @utils.userAvatar(notification.origin, clazz = "user-avatar-s") + @notification.message - @if(!notification.isRead) { - - } -
      • - } -
    + @if(!notification.isRead) { + + } +
    • + } +
+
+
+
+ +
+
+

@messages("notification.invites")

+ +
+
+
+ +
- -
- - @for((invite, i) <- invites.zipWithIndex) { - @if(i % 2 == 0) { -
- } + @for((invite, i) <- invites.zipWithIndex) { + @if(i % 2 == 0) { +
+ } -
-
+
+
@defining(invite.subject) { subject => @@ -121,10 +129,10 @@

@subject.name.

@@ -132,10 +140,10 @@


@Html(messages("notification.invite.joined", subject.name))
- @messages("notification.invite.visit") + @messages("notification.invite.visit")

@@ -146,15 +154,16 @@

} +

-
- @if((i + 1) % 2 == 0) { + @if((i + 1) % 2 == 0) {
+ } } - } +
+
- } diff --git a/conf/messages b/conf/messages index 3f8bf278a..605b8aa86 100755 --- a/conf/messages +++ b/conf/messages @@ -309,6 +309,7 @@ notification.organization.invite = You have been invited to join the group notification.empty.unread = You have no unread notifications. notification.empty.read = You have no read notifications. notification.empty.all = You have no notifications. +notification.project.reviewed = {0} {1} has been reviewed and is approved. prompt.confirm = Got it! prompt.changeAvatar.title = Change your avatar! From b76bd382aa10d230bfc996b03b91fcc3ca710c44 Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Mon, 29 Jan 2018 19:37:28 -0500 Subject: [PATCH 27/77] Fix plugin upload validation --- app/controllers/project/Projects.scala | 10 +++++++--- app/form/OreForms.scala | 26 ++++++++++++++++++++++++-- conf/messages | 1 + 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/app/controllers/project/Projects.scala b/app/controllers/project/Projects.scala index 16d733fc3..5210a433b 100755 --- a/app/controllers/project/Projects.scala +++ b/app/controllers/project/Projects.scala @@ -8,7 +8,7 @@ import controllers.sugar.Bakery import db.ModelService import discourse.OreDiscourseApi import form.OreForms -import ore.permission.{EditSettings, HideProjects, PostAsOrganization, ViewLogs} +import ore.permission._ import ore.project.FlagReasons import ore.project.factory.ProjectFactory import ore.project.io.{InvalidPluginFileException, PluginUpload} @@ -108,11 +108,13 @@ class Projects @Inject()(stats: StatTracker, * @return View of members config */ def showInvitationForm(author: String, slug: String) = UserLock() { implicit request => + val organisationUserCanUploadTo = request.user.organizations.all + .filter(request.user can CreateProject in _).map(_.id.get).toSeq :+ request.user.id.get this.factory.getPendingProject(author, slug) match { case None => Redirect(self.showCreator()) case Some(pendingProject) => - this.forms.ProjectSave.bindFromRequest().fold( + this.forms.ProjectSave(organisationUserCanUploadTo).bindFromRequest().fold( hasErrors => FormError(self.showCreator(), hasErrors), formData => { @@ -449,8 +451,10 @@ class Projects @Inject()(stats: StatTracker, * @return View of project */ def save(author: String, slug: String) = SettingsEditAction(author, slug) { implicit request => + val organisationUserCanUploadTo = request.user.organizations.all + .filter(request.user can CreateProject in _).map(_.id.get).toSeq :+ request.user.id.get val project = request.project - this.forms.ProjectSave.bindFromRequest().fold( + this.forms.ProjectSave(organisationUserCanUploadTo).bindFromRequest().fold( hasErrors => FormError(self.showSettings(author, slug), hasErrors), formData => { diff --git a/app/form/OreForms.scala b/app/form/OreForms.scala index 4fc66a9b4..845c04df4 100755 --- a/app/form/OreForms.scala +++ b/app/form/OreForms.scala @@ -19,6 +19,7 @@ import ore.rest.ProjectApiKeyTypes.ProjectApiKeyType import play.api.data.{Form, FormError} import play.api.data.Forms._ import play.api.data.format.Formatter +import play.api.data.validation.{Constraint, Invalid, Valid, ValidationError} import scala.util.Try @@ -64,10 +65,31 @@ class OreForms @Inject()(implicit config: OreConfig, factory: ProjectFactory, se "comment" -> nonEmptyText) (FlagForm.apply)(FlagForm.unapply)) + + /** + * This is a Constraint checker for the ownerId that will search the list allowedIds to see if the number is in it. + * @param allowedIds number that are allowed as ownerId + * @return Constraint + */ + def ownerIdInList(allowedIds: Seq[Int]): Constraint[Option[Int]] = Constraint("constraints.check")({ + ownerId => + var errors: Seq[ValidationError] = Seq() + if (ownerId.isDefined) { + if (!allowedIds.contains(ownerId.get)) { + errors = Seq(ValidationError("error.plugin")) + } + } + if (errors.isEmpty) { + Valid + } else { + Invalid(errors) + } + }) + /** * Submits settings changes for a Project. */ - lazy val ProjectSave = Form(mapping( + def ProjectSave(organisationUserCanUploadTo: Seq[Int]) = Form(mapping( "category" -> text, "issues" -> url, "source" -> url, @@ -79,7 +101,7 @@ class OreForms @Inject()(implicit config: OreConfig, factory: ProjectFactory, se "userUps" -> list(text), "roleUps" -> list(text), "update-icon" -> boolean, - "owner" -> optional(number) + "owner" -> optional(number).verifying(ownerIdInList(organisationUserCanUploadTo)) )(ProjectSettingsForm.apply)(ProjectSettingsForm.unapply)) /** diff --git a/conf/messages b/conf/messages index 605b8aa86..f3ef1cb99 100755 --- a/conf/messages +++ b/conf/messages @@ -113,6 +113,7 @@ error.plugin.incomplete = Plugin meta file missing required field "{0} error.plugin.notSponge = Project is marked as a Sponge Plugin and new version contains no dependency to Sponge. error.plugin.notForge = Project is marked as a Forge Mod and new version contains no dependency to Forge. error.plugin.fileName = Filename already in use. Please rename your file and try again. +error.plugin.owner = Uploading under the wrong owner. error.spongeauth.auth = Couldn't connect to SpongeAuth. error.spongeauth.parse = That name is invalid, please choose a name without spaces or symbols. From be16aee89734d87203a562a3378eb4267c970ac8 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Mon, 29 Jan 2018 19:39:50 -0500 Subject: [PATCH 28/77] Release version 1.5.1 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index e0d962ab3..3836512df 100755 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ name := "ore" -version := "1.5.0" +version := "1.5.1" lazy val `ore` = (project in file(".")).enablePlugins(PlayScala) From b1a0ef965e50f5ba1ea165c23e20c523db78551a Mon Sep 17 00:00:00 2001 From: Jadon Fowler Date: Mon, 29 Jan 2018 23:12:03 -0800 Subject: [PATCH 29/77] Add else for Max Review Time Fixes #394 Co-authored-by: Ryan Leach Signed-off-by: Jadon Fowler --- app/views/users/admin/queue.scala.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/admin/queue.scala.html b/app/views/users/admin/queue.scala.html index 19f9a4766..e18d5c777 100755 --- a/app/views/users/admin/queue.scala.html +++ b/app/views/users/admin/queue.scala.html @@ -172,7 +172,7 @@

@messages("user.queue.none")

+ + +
+
+
+
+

@messages("notes") for @project.ownerName/@project.slug

+
+
+
+
+
+
+ +
@messages("notes.addmessage")
+
+
+
+
+
+

@messages("notes")

+
+ @if(notes.isEmpty) { +
+ +
+ } + +
+ + + @notes.map { note => + + + + + + } + +
@prettifyDateAndTime(new Timestamp(note.time))@users.get(note.user).map(_.username).getOrElse("Unknown")@note.render
+
+
+
+} diff --git a/app/views/projects/log.scala.html b/app/views/projects/log.scala.html index 96a0ec32a..efc91126c 100644 --- a/app/views/projects/log.scala.html +++ b/app/views/projects/log.scala.html @@ -5,12 +5,14 @@ @(project: Project)(implicit messages: Messages, request: Request[_], service: ModelService, config: OreConfig, users: UserBase) +@projectRoutes = @{controllers.project.routes.Projects} + @bootstrap.layout(messages("project.log.title", project.namespace)) {
-

@messages("project.log.title", project.namespace)

+

@messages("project.log.title", "") @project.ownerName/@project.slug

diff --git a/app/views/projects/view.scala.html b/app/views/projects/view.scala.html index 4c9baec7b..9af0703c4 100755 --- a/app/views/projects/view.scala.html +++ b/app/views/projects/view.scala.html @@ -11,6 +11,9 @@ @import ore.project.FlagReasons @import security.NonceFilter._ @import views.html.helper.{CSRF, form} +@import ore.permission.ReviewProjects +@import ore.permission.ReviewFlags +@import ore.permission.ViewLogs @(project: Project, active: String, noButtons: Boolean = false)(content: Html)(implicit messages: Messages, request: Request[_], flash: Flash, service: ModelService, config: OreConfig, users: UserBase) @@ -19,6 +22,9 @@ @isOwner(user: User) = @{ user.id.get == project.ownerId } @projectRoutes = @{ controllers.project.routes.Projects } @versionRoutes = @{ controllers.project.routes.Versions } +@canAdminFlag = @{ user can ReviewFlags in project } +@canAdminNotes = @{ user can ReviewFlags in project } +@canAdminLog = @{ user can ViewLogs in project } @bootstrap.layout(project.ownerName + " / " + project.name) { @@ -201,6 +207,28 @@ data-placement="bottom" class="btn btn-primary"> @messages("general.download") + + @if(user can ReviewProjects in project) { + + + }
}
diff --git a/conf/evolutions/default/84.sql b/conf/evolutions/default/84.sql new file mode 100644 index 000000000..afd4a2888 --- /dev/null +++ b/conf/evolutions/default/84.sql @@ -0,0 +1,7 @@ +# --- !Ups + +ALTER TABLE projects ADD COLUMN notes TEXT NOT NULL DEFAULT ''; + +# --- !Downs + +ALTER TABLE projects DROP COLUMN notes; diff --git a/conf/messages b/conf/messages index f3ef1cb99..ff4d7bef7 100755 --- a/conf/messages +++ b/conf/messages @@ -346,3 +346,6 @@ review.whytakeover = Please explain why you are takingover review.addmessage = Add message queue.review.none = There are no reviews in progress activity.title = Activity: + +notes = Notes +notes.addmessage = Add message \ No newline at end of file diff --git a/conf/routes b/conf/routes index 881854b7d..bd97c2c2d 100755 --- a/conf/routes +++ b/conf/routes @@ -122,6 +122,9 @@ POST /:author/:slug/manage/delete @controllers POST /:author/:slug/manage/members/remove @controllers.project.Projects.removeMember(author, slug) GET /:author/:slug/log @controllers.project.Projects.showLog(author, slug) +GET /:author/:slug/flags @controllers.project.Projects.showFlags(author, slug) +GET /:author/:slug/notes @controllers.project.Projects.showNotes(author, slug) +POST /:author/:slug/notes/addmessage @controllers.project.Projects.addMessage(author, slug) GET /:author/:slug/issues @controllers.project.Projects.showIssues(author, slug) GET /:author/:slug/source @controllers.project.Projects.showSource(author, slug) diff --git a/public/javascripts/notes.js b/public/javascripts/notes.js new file mode 100644 index 000000000..c26a96dfa --- /dev/null +++ b/public/javascripts/notes.js @@ -0,0 +1,39 @@ +/* + * ================================================== + * _____ _ + * | |___ ___ |_|___ + * | | | _| -_|_ | |_ -| + * |_____|_| |___|_|_| |___| + * |___| + * + * (C) SpongePowered 2018 MIT License + * https://github.com/SpongePowered/Ore + * + * Powers the notes. + * + * ================================================== + */ + + +/* + * ================================================== + * = Doc ready = + * ================================================== + */ + +$(function() { + $('.btn-note-addmessage-submit').click(function() { + var panel = $(this).parent().parent().parent(); + var textarea = panel.find('textarea'); + textarea.attr('disabled', 'disabled'); + $(this).find('i').removeClass('fa-save').addClass('fa-spinner fa-spin'); + $.ajax({ + type: 'post', + url: '/' + resourcePath + '/notes/addmessage', + data: { csrfToken: csrf, content: textarea.val() }, + success: function() { + location.reload(); + } + }); + }); +}); From da151c468c044207b18916338804d6019f1112af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Kleinekath=C3=B6fer?= Date: Wed, 31 Jan 2018 17:39:19 +0100 Subject: [PATCH 37/77] Fixed edge case in version list pagination --- public/javascripts/versionList.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/javascripts/versionList.js b/public/javascripts/versionList.js index f85593209..f4f6b8e04 100644 --- a/public/javascripts/versionList.js +++ b/public/javascripts/versionList.js @@ -106,7 +106,7 @@ function loadVersions(increment, scrollTop) { content = ""; // [First] ... - if(page >= 3) { + if(totalPages > 3 && page >= 3) { content += "
  • " + 1 + "
    • "; if(page > 3) { @@ -138,7 +138,7 @@ function loadVersions(increment, scrollTop) { } // [Last] ... - if(left > 1) { + if(totalPages > 3 && left > 1) { if(left > 2) { content += "
  • ...
    • " } From 5d6029cc1e3a0686c9ac69710a2df31798a399a0 Mon Sep 17 00:00:00 2001 From: Phillip Schichtel Date: Sat, 3 Feb 2018 21:38:58 +0100 Subject: [PATCH 38/77] Add a mime-keyed CSP filter I backported this from another project of mine. The filter has 2 advantages over Play's standard filter: 1. Different Content-Types can receive different CSP header which is useful to support SVGs with inline style which is fairly common. 2. The configuration of the header is done in a HOCON map instead of a single string Signed-off-by: Phillip Schichtel --- app/filters/MimeKeyedCspFilter.scala | 68 ++++++++++++++++++++++++++++ conf/application.conf.template | 37 +++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 app/filters/MimeKeyedCspFilter.scala diff --git a/app/filters/MimeKeyedCspFilter.scala b/app/filters/MimeKeyedCspFilter.scala new file mode 100644 index 000000000..94c83c851 --- /dev/null +++ b/app/filters/MimeKeyedCspFilter.scala @@ -0,0 +1,68 @@ +package filters + +import javax.inject.{Inject, Singleton} + +import akka.stream.Materializer +import play.api.Configuration +import play.api.http.HeaderNames.CONTENT_TYPE +import play.api.mvc.{Filter, RequestHeader, Result} +import play.filters.headers.SecurityHeadersFilter.CONTENT_SECURITY_POLICY_HEADER + +import scala.collection.JavaConverters._ +import scala.concurrent.{ExecutionContext, Future} + +@Singleton +class MimeKeyedCspFilter @Inject()(implicit val mat: Materializer, ec: ExecutionContext, conf: Configuration) extends Filter { + + private type CspSpec = Map[String, Seq[String]] + + private val keyWords = Set("self", "unsafe-inline", "none") + private val defaultMime: String = compileHeader(readCspSpec(conf.getConfig("filters.csp.default"))) + private val mimeLookup: Map[String, String] = { + conf.getConfig("filters.csp.per-mime") match { + case Some(perMime) => perMime.keys.map(k => (k, compileHeader(readCspSpec(perMime.getConfig(k))))).toMap + case None => Map.empty + } + } + + private def readCspSpec(conf: Option[Configuration]): CspSpec = { + conf match { + case Some(defaults) => + defaults.keys.map { k => + (k, defaults.getStringList(k).map(_.asScala).getOrElse(Seq.empty)) + }.toMap.filter(_._2.nonEmpty) + case None => Map.empty + } + } + + private def compileHeader(section: CspSpec): String = { + val parts = for ((key, values) <- section) yield { + val combinedValue = values.map { + case v if keyWords.contains(v) => s"'$v'" + case v => v + }.mkString(" ") + s"${key.toLowerCase} $combinedValue" + } + + parts.mkString("; ") + } + + private def detectMime(request: RequestHeader): Option[String] = { + request.path match { + case p if p.endsWith(".svg") => Some("image/svg") + case _ => None + } + } + + override def apply(next: (RequestHeader) => Future[Result])(request: RequestHeader): Future[Result] = { + next(request) map { result => + val contentType = result.header.headers.get(CONTENT_TYPE) match { + case ct @ Some(_) => ct + case _ => detectMime(request) + } + val csp = contentType.flatMap(mimeLookup.get).getOrElse(defaultMime) + result.withHeaders(CONTENT_SECURITY_POLICY_HEADER -> csp) + } + } + +} diff --git a/conf/application.conf.template b/conf/application.conf.template index 93b7dd582..421d78c91 100755 --- a/conf/application.conf.template +++ b/conf/application.conf.template @@ -36,6 +36,7 @@ play { ws.timeout.connection = 10000 filters.headers.contentSecurityPolicy = "default-src 'self'; script-src 'self' '%NONCE-SOURCE%' https://forums.spongepowered.org https://forums-cdn.spongepowered.org https://www.google-analytics.com/analytics.js; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com https://forums-cdn.spongepowered.org; img-src 'self' https:; font-src 'self' https://fonts.gstatic.com; frame-src https://forums.spongepowered.org; frame-ancestors 'none'; block-all-mixed-content" filters.headers.contentSecurityPolicy = ${?CONTENT_SECURITY_POLICY} + filters.enabled += "filters.MimeKeyedCspFilter" filters.csrf.body.bufferSize = 1000000 } @@ -227,3 +228,39 @@ sponge { } ] } + +filters { + csp { + default { + default-src = ["self"] + script-src = [ + "self", + "'%NONCE-SOURCE%'" + "https://forums.spongepowered.org" + "https://forums-cdn.spongepowered.org" + "https://www.google-analytics.com/analytics.js" + ] + style-src = [ + "self" + "unsafe-inline" + "https://fonts.googleapis.com" + "https://forums-cdn.spongepowered.org" + ] + img-src = [ + "self", + "https:" + ] + font-src = [ + "self" + "https://fonts.gstatic.com" + ] + frame-src = [ + "https://forums.spongepowered.org" + ] + frame-ancestors = [ + "none" + ] + block-all-mixed-content = [] + } + } +} \ No newline at end of file From 4b3f5c8f27592511ec6d2e5b87cc5d67bf651f3b Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Mon, 5 Feb 2018 10:56:35 +0100 Subject: [PATCH 39/77] Fix #406 --- app/views/projects/channels/list.scala.html | 5 +++-- public/javascripts/channelManage.js | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/views/projects/channels/list.scala.html b/app/views/projects/channels/list.scala.html index 0bfd92e42..7e87546b0 100755 --- a/app/views/projects/channels/list.scala.html +++ b/app/views/projects/channels/list.scala.html @@ -57,13 +57,14 @@

    @messages("channel.list.title")

    id="channel-delete-@channel.id" data-toggle="modal" data-target="#modal-delete"> } else { + id="channel-delete-@channel.id.get" data-channel-delete="safe-delete" + data-channel-id="@channel.id.get"> + @form(action = channelRoutes.delete( project.ownerName, project.slug, channel.name), 'id -> s"form-delete-${channel.id.get}", 'class -> "form-channel-delete") { @CSRF.formField - id="channel-delete-@channel.id.get" class="safe-delete" - data-channel-id="@channel.id.get"> } } Delete diff --git a/public/javascripts/channelManage.js b/public/javascripts/channelManage.js index 1b0d7ba82..ba6be8e4d 100644 --- a/public/javascripts/channelManage.js +++ b/public/javascripts/channelManage.js @@ -54,11 +54,9 @@ function initChannelDelete(toggle, channelName, versionCount) { modal.find('.modal-footer').find('form').attr('action', url); modal.find('.version-count').text(versionCount); }); - $('.safe-delete').click(function(e) { - console.log('clicked'); + $('.btn[data-channel-delete]').click(function(e) { e.preventDefault(); var id = $(this).data('channel-id'); - console.log(id); $('#form-delete-' + id)[0].submit(); }); } From b602456e50a02d5540c42a6b06edff135af33e0d Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Wed, 7 Feb 2018 11:10:16 +0100 Subject: [PATCH 40/77] Fix child page list rendering correct if feched by ajax --- public/javascripts/pageCollapse.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/public/javascripts/pageCollapse.js b/public/javascripts/pageCollapse.js index 9143b8756..d3faee137 100644 --- a/public/javascripts/pageCollapse.js +++ b/public/javascripts/pageCollapse.js @@ -16,14 +16,15 @@ function bindExpand(e) { listItem.after(div); for (var i = 0; i < childPages.length; i++) { var page = childPages[i]; - div.append( + var childPage = $( '
  • ' + '' + '
    • ' ); - var link = div.find("li a"); + var link = childPage.find('a'); link.attr("href", '/' + namespace + '/pages/' + page.name); - link.text(page.name) // this will sanitize the input + link.text(page.name); // this will sanitize the input + div.append(childPage); } $this.removeClass('page-expand') .addClass('page-collapse') From f9c75d6d920c3645275c496b0b17442b3109c04e Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Wed, 7 Feb 2018 17:46:10 +0100 Subject: [PATCH 41/77] Fix #398 --- app/views/projects/channels/utils/modalManage.scala.html | 3 ++- conf/messages | 1 + public/javascripts/channelManage.js | 7 ++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/views/projects/channels/utils/modalManage.scala.html b/app/views/projects/channels/utils/modalManage.scala.html index bc1ad570c..5601b70fe 100755 --- a/app/views/projects/channels/utils/modalManage.scala.html +++ b/app/views/projects/channels/utils/modalManage.scala.html @@ -26,6 +26,7 @@

    @projects.channels.utils.popoverColorPicker() +

    @messages("channel.nameRequirements")


    @messages("channel.nonReviewed")

    - +
    }
    diff --git a/conf/messages b/conf/messages index f282983ae..4d81091ef 100755 --- a/conf/messages +++ b/conf/messages @@ -252,6 +252,7 @@ channel.delete.info = Are you sure you want to delete this channel channel.delete.info.versions = versions will be deleted. channel.nonReviewed = Exclude versions in this channel from the staff approval queue channel.nonReviewed.info = Certain restrictions may apply +channel.nameRequirements = Name must be: unique, alphanumerical, no spaces, max 15 characters aria.dropdown.menu = dropdownMenu{0} diff --git a/public/javascripts/channelManage.js b/public/javascripts/channelManage.js index ba6be8e4d..1f6c511f9 100644 --- a/public/javascripts/channelManage.js +++ b/public/javascripts/channelManage.js @@ -82,6 +82,7 @@ function initChannelManager(toggle, channelName, channelHex, title, call, method modal.find('.color-picker').css('color', channelHex); modal.find('.modal-title').text(title); modal.find('.non-reviewed').prop('checked', nonReviewed); + modal.find('input[type=submit]').attr('disabled', null); preview.css('background-color', channelHex).text(channelName); // Set input values @@ -127,10 +128,14 @@ function initModal() { modal.find('.channel-input').on('input', function() { var val = $(this).val(); var preview = getModal().find('.preview'); - if (val.length === 0) { + var submit = getModal().find('input[type=submit]'); + var pattern = /^[a-zA-Z0-9]+$/; + if (val.length === 0 || !pattern.exec(val)) { preview.hide(); + submit.attr('disabled', true); } else { preview.show().text(val); + submit.attr('disabled', null); } }); initColorPicker(); From af0b651926b4af92702308cccbe6c0bb3d257dfa Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Wed, 31 Jan 2018 11:20:59 +0100 Subject: [PATCH 42/77] Update upload process to show more info --- app/ore/project/factory/PendingVersion.scala | 17 ++++++++++++++++- app/ore/project/factory/ProjectFactory.scala | 5 ++--- app/views/projects/create.scala.html | 12 ++++++++++++ app/views/projects/versions/create.scala.html | 14 +++++++++++++- public/javascripts/pluginUpload.js | 5 +++++ 5 files changed, 48 insertions(+), 5 deletions(-) diff --git a/app/ore/project/factory/PendingVersion.scala b/app/ore/project/factory/PendingVersion.scala index 10010f77a..67ae977bc 100644 --- a/app/ore/project/factory/PendingVersion.scala +++ b/app/ore/project/factory/PendingVersion.scala @@ -1,9 +1,10 @@ package ore.project.factory import db.impl.access.ProjectBase -import models.project.{Project, Version} +import models.project._ import ore.Cacheable import ore.Colors.Color +import ore.project.Dependency import ore.project.io.PluginFile import play.api.cache.CacheApi import util.PendingAction @@ -44,4 +45,18 @@ case class PendingVersion(projects: ProjectBase, override def key: String = this.project.url + '/' + this.underlying.versionString + def dependenciesAsGhostTags: Seq[Tag] = { + var ghostFlags: Seq[Tag] = Seq() + for (dependency <- this.underlying.dependencies) { + if (factory.dependencyVersionRegex.pattern.matcher(dependency.version).matches()) { + if (dependency.pluginId.equalsIgnoreCase(Dependency.SpongeApiId)) { + ghostFlags = ghostFlags :+ Tag(None, List(), "Sponge", dependency.version, TagColors.Sponge) + } + if (dependency.pluginId.equalsIgnoreCase(Dependency.ForgeId)) { + ghostFlags = ghostFlags :+ Tag(None, List(), "Forge", dependency.version, TagColors.Forge) + } + } + } + ghostFlags + } } diff --git a/app/ore/project/factory/ProjectFactory.scala b/app/ore/project/factory/ProjectFactory.scala index d8f6d36d0..ca6e51a68 100755 --- a/app/ore/project/factory/ProjectFactory.scala +++ b/app/ore/project/factory/ProjectFactory.scala @@ -50,6 +50,7 @@ trait ProjectFactory { val cacheApi: CacheApi val actorSystem: ActorSystem val pgp: PGPVerifier = new PGPVerifier + val dependencyVersionRegex = "^[0-9a-zA-Z\\.\\,\\[\\]\\(\\)-]+$".r implicit val messages: MessagesApi implicit val config: OreConfig @@ -331,9 +332,7 @@ trait ProjectFactory { if (dependenciesMatchingName.nonEmpty) { val dependency = dependenciesMatchingName.head - val versionRegex = "^[0-9a-zA-Z\\.\\,\\[\\]\\(\\)-]+$".r - - if (!versionRegex.pattern.matcher(dependency.version).matches()) { + if (!dependencyVersionRegex.pattern.matcher(dependency.version).matches()) { return } diff --git a/app/views/projects/create.scala.html b/app/views/projects/create.scala.html index 22be75dab..e78e5603a 100755 --- a/app/views/projects/create.scala.html +++ b/app/views/projects/create.scala.html @@ -10,6 +10,8 @@ @import security.NonceFilter._ @import views.html.helper.{CSRF, form} @import ore.permission.CreateProject +@import models.project.Tag +@import models.project.TagColors @(pending: Option[PendingProject])(implicit messages: Messages, flash: Flash, request: Request[_], service: ModelService, config: OreConfig, users: UserBase) @@ -64,6 +66,16 @@ } + + Platform + +
    + @for(t <- pending.get.pendingVersion.dependenciesAsGhostTags) { + @projects.tag(t) + } +
    + + diff --git a/app/views/projects/versions/create.scala.html b/app/views/projects/versions/create.scala.html index 07b5e1efc..8dda9c04f 100755 --- a/app/views/projects/versions/create.scala.html +++ b/app/views/projects/versions/create.scala.html @@ -7,6 +7,8 @@ @import security.NonceFilter._ @import util.StringUtils @import views.html.helper.{CSRF, form} +@import models.project.Tag +@import models.project.TagColors @(project: Project, pending: Option[PendingVersion], channels: Option[Seq[Channel]], showFileControls: Boolean)(implicit messages: Messages, flash: Flash, request: Request[_], service: ModelService, config: OreConfig, users: UserBase) @@ -54,7 +56,7 @@

    @version.description.map { description => @description }.getOrElse { - @messages("version.create.noDescription") + @project.description.getOrElse(messages("version.create.noDescription")) } @@ -106,6 +108,16 @@

    } + + Platform + +
    + @for(t <- pending.get.dependenciesAsGhostTags) { + @projects.tag(t) + } +
    + + @messages("version.create.unstable") diff --git a/public/javascripts/pluginUpload.js b/public/javascripts/pluginUpload.js index d91adda0f..d3ad615c4 100644 --- a/public/javascripts/pluginUpload.js +++ b/public/javascripts/pluginUpload.js @@ -100,6 +100,11 @@ function addSig(e) { */ $(function() { + var platformTags = $('#upload-platform-tags'); + if (platformTags.size() >= 1 && platformTags.children().length == 0) { + platformTags.html('
    No Platform Detected
    '); + } + $('#pluginFile').on('change', function() { var alert = reset(); if (this.files.length == 0) { From b26003dc9f53b2f7341a1a45c62a88eabdb93f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Kleinekath=C3=B6fer?= Date: Wed, 31 Jan 2018 18:30:13 +0100 Subject: [PATCH 43/77] Removed rounded corners and some other minor fixes --- app/assets/stylesheets/_creator.scss | 5 ++--- app/assets/stylesheets/_editor.scss | 3 +-- app/assets/stylesheets/_nav.scss | 2 +- app/assets/stylesheets/_panel.scss | 10 ++-------- app/assets/stylesheets/_user.scss | 8 ++------ app/assets/stylesheets/main.scss | 24 +++++++++++++++++------- 6 files changed, 25 insertions(+), 27 deletions(-) diff --git a/app/assets/stylesheets/_creator.scss b/app/assets/stylesheets/_creator.scss index 6ce5df4f9..9606be660 100644 --- a/app/assets/stylesheets/_creator.scss +++ b/app/assets/stylesheets/_creator.scss @@ -2,7 +2,6 @@ @import 'pallette'; .project-create-steps { - @include rounded-corners(); background-color: #fafafa; color: #ccc; border: 1px solid $lighter; @@ -118,7 +117,7 @@ .table-members { border-top: none; - border-bottom: 1px solid #ddd; + border-bottom: 1px solid $lighter; .input-group { max-width: 35%; } tbody > tr > td { padding: 10px; } tr > td:last-child { text-align: right; } @@ -131,7 +130,7 @@ } .release-bulletin { - border-bottom: 1px solid #ddd; + border-bottom: 1px solid $lighter; > div { width: 90%; margin: 10px auto 0; diff --git a/app/assets/stylesheets/_editor.scss b/app/assets/stylesheets/_editor.scss index 2dae98c18..3386875f9 100644 --- a/app/assets/stylesheets/_editor.scss +++ b/app/assets/stylesheets/_editor.scss @@ -2,7 +2,6 @@ @import 'utils'; .page-rendered, .page-edit textarea { - @include rounded-corners(); min-height: 350px; margin-bottom: 20px; width: 100%; @@ -89,7 +88,7 @@ button.open:hover { } .page-editor-tabs > li > a:hover { - border-bottom: 1px solid #ddd; + border-bottom: 1px solid $lighter; } .page-editor-tabs > li > a:hover, diff --git a/app/assets/stylesheets/_nav.scss b/app/assets/stylesheets/_nav.scss index bc62f6a92..48b5d1be6 100644 --- a/app/assets/stylesheets/_nav.scss +++ b/app/assets/stylesheets/_nav.scss @@ -31,7 +31,7 @@ .navbar-nav > li > .main-dropdown, .user-dropdown { @include no-box-shadow(); - border-radius: 0 0 4px 4px; + border-radius: 0; border: 1px solid #e4e4e4; } diff --git a/app/assets/stylesheets/_panel.scss b/app/assets/stylesheets/_panel.scss index c4141bb7e..06515b5a5 100644 --- a/app/assets/stylesheets/_panel.scss +++ b/app/assets/stylesheets/_panel.scss @@ -1,17 +1,11 @@ .panel.panel-default { - border: 1px solid $sponge_grey; - border-radius: 4px; -} - -.panel>.list-group:last-child .list-group-item:last-child, .panel>.panel-collapse>.list-group:last-child .list-group-item:last-child { - border-bottom-right-radius: 4px; - border-bottom-left-radius: 4px; + border: 1px solid $lighter; } .panel > .panel-pagination { background: $sponge_grey; text-align: center; - border-top: 1px solid #ddd; + border-top: 1px solid $lighter; display: flex; align-items: center; justify-content: center; diff --git a/app/assets/stylesheets/_user.scss b/app/assets/stylesheets/_user.scss index 44541c4b1..cdb5da297 100644 --- a/app/assets/stylesheets/_user.scss +++ b/app/assets/stylesheets/_user.scss @@ -147,8 +147,6 @@ textarea[name="pgp-pub-key"] { text-align: center; font-size: 10px; bottom: 9px; - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; } #form-avatar input[name="avatar-url"] { @@ -158,7 +156,7 @@ textarea[name="pgp-pub-key"] { .user-header { @include size(100%, 150px); padding: 20px; - border-bottom: 1px solid #ddd; + border-bottom: 1px solid $lighter; margin-bottom: 40px; .user-badge { @@ -264,7 +262,6 @@ textarea[name="pgp-pub-key"] { height: 25px; top: 30%; right: 1%; - @include rounded-corners(); } .btn-mark-read:hover { @@ -299,7 +296,7 @@ textarea[name="pgp-pub-key"] { } .user-cancel:hover { - background-color: #ddd; + background-color: $lighter; } .invite { @@ -333,7 +330,6 @@ textarea[name="pgp-pub-key"] { } .prompt { - @include rounded-corners(); z-index: 0; display: block; diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 2b0f37581..ad90fcd6a 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -232,8 +232,6 @@ form { } .btn { - border-radius: 4px; - &:focus, &:active:focus, &.active:focus, &.focus, &:active.focus, &.active.focus { outline: none; } @@ -242,13 +240,21 @@ form { background: $sponge_dark_grey; border: 1px solid $sponge_light_gray; color: #ffffff; + + &:hover { + background: darken($sponge_dark_grey, 1); + } } &.yellow { background: $sponge_yellow; - border: 1px solid $sponge_dark_yellow; + border: 1px solid darken($sponge_yellow, 7); color: darken($sponge_yellow, 30); font-weight: 600; + + &:hover { + background: darken($sponge_yellow, 2); + } } } @@ -275,13 +281,12 @@ form { } select.form-control, input.form-control { - border-radius: 4px; box-shadow: none; - border: 1px solid $sponge_grey; + border: 1px solid $lighter; &:focus { box-shadow: none; - border: 1px solid $sponge_grey; + border: 1px solid $lighter; } } @@ -408,6 +413,11 @@ select.form-control, input.form-control { font-weight: bold; vertical-align: top; } + .table-notes-log tr .note-fixed-with { width: 10em; -} \ No newline at end of file +} + +.input-group .input-group-btn { + z-index: 999; +} From abf47ba1b0a7447183889694037a33a64727d8b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Kleinekath=C3=B6fer?= Date: Tue, 16 Jan 2018 22:22:44 +0100 Subject: [PATCH 44/77] Fixed nav-icon hover and some navigation margins --- app/assets/stylesheets/_nav.scss | 61 +++++++++++++++++---------- app/views/bootstrap/header.scala.html | 13 +++--- 2 files changed, 45 insertions(+), 29 deletions(-) diff --git a/app/assets/stylesheets/_nav.scss b/app/assets/stylesheets/_nav.scss index bc62f6a92..5c823b9d7 100644 --- a/app/assets/stylesheets/_nav.scss +++ b/app/assets/stylesheets/_nav.scss @@ -46,6 +46,7 @@ .user-dropdown > li { position: relative; + .unread { bottom: 6px; margin-left: 5px; @@ -54,19 +55,17 @@ .navbar-main { .navbar-right > li > a { padding: 0; } - .navbar-right { - @include padding-vert(9px, 9px); - padding-right: 20px; - } } .nav-icon { @include transition2(background-color, 0.5s); cursor: pointer; - padding: 7px; - margin-right: 5px; text-align: center; + &:not(:last-child) { + margin-right: 20px; + } + .icon { @include transition2(color, 0.5s); cursor: pointer; @@ -75,30 +74,43 @@ } } -.nav-icon:hover { - background-color: white; - .icon { color: black; } +.nav-icon:hover, .nav-icon:hover a { + .icon { color: white; } + .user-avatar { + background: white; + } } -.new-icon { - .caret { padding-bottom: 10px; } +.authors-icon { + margin-top: 19px; } -.new-icon:hover { - background-color: transparent; - .icon { color: #F6CF17; } +.no-caret { + .caret { + display: none; + } } -.user-controls { - @include padding-vert(5px, 17px); -} +li.user-controls { + margin-top: 15.5px; -.new-controls { - @include padding-vert(10px, 19px); + > .dropdown-menu { + margin-top: 15px; + margin-right: -5px; + } } -.user-avatar:hover { - background-color: white; +li.new-controls { + margin-top: 19.5px; + + > .dropdown-menu { + margin-top: 17px; + margin-right: -5px; + } + + .caret { + margin-bottom: 10px; + } } .user-dropdown > li > a { @@ -121,10 +133,13 @@ @include size(12px, 12px); @include circle(); position: absolute; - background-image: linear-gradient(#e6b800, #FFD21A); + background-image: linear-gradient(#CC0000, #B70000); } .user-toggle { position: relative; - .unread { right: 10px; } + .unread { + right: 10px; + top: -4px; + } } diff --git a/app/views/bootstrap/header.scala.html b/app/views/bootstrap/header.scala.html index 218677c7c..d0ba8d5bc 100755 --- a/app/views/bootstrap/header.scala.html +++ b/app/views/bootstrap/header.scala.html @@ -63,13 +63,9 @@ @if(user) { + +
  • + +
    • + @* Show user controls *@ -
  • +
  • @if(user.hasUnreadNotifications) { From 45c79c3ac89702d0295ee1cf5fee148c48b34145 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Wed, 7 Feb 2018 15:35:41 -0500 Subject: [PATCH 45/77] Bump build # for 1.5.3 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 73d9f005e..16e7f09ff 100755 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ name := "ore" -version := "1.5.2" +version := "1.5.3" lazy val `ore` = (project in file(".")).enablePlugins(PlayScala) From 8b57931b969b34b52e894e6d8703b328c13fe828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Kleinekath=C3=B6fer?= Date: Wed, 7 Feb 2018 21:49:43 +0100 Subject: [PATCH 46/77] Fixed login button styling --- app/assets/stylesheets/_nav.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/_nav.scss b/app/assets/stylesheets/_nav.scss index 7d5578dba..76a97f6e1 100644 --- a/app/assets/stylesheets/_nav.scss +++ b/app/assets/stylesheets/_nav.scss @@ -122,6 +122,7 @@ li.new-controls { } .btn-group-login { + margin-top: 10.5px; padding: 4px; } From ba5dba2888e2421669e5f67b50e78012a3b1519f Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Wed, 7 Feb 2018 15:56:26 -0500 Subject: [PATCH 47/77] bump build # for 1.5.4 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 16e7f09ff..dcdab37e7 100755 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ name := "ore" -version := "1.5.3" +version := "1.5.4" lazy val `ore` = (project in file(".")).enablePlugins(PlayScala) From 6816d958d00e2919c5a1693160534db1c3b7967f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Kleinekath=C3=B6fer?= Date: Wed, 7 Feb 2018 22:10:36 +0100 Subject: [PATCH 48/77] Don't display the error message to all users --- app/ErrorHandler.scala | 2 +- app/views/errors/error.scala.html | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/ErrorHandler.scala b/app/ErrorHandler.scala index 5fc4ec13f..54473c771 100755 --- a/app/ErrorHandler.scala +++ b/app/ErrorHandler.scala @@ -34,7 +34,7 @@ class ErrorHandler @Inject()(env: Environment, if (exception.cause.isInstanceOf[TimeoutException]) GatewayTimeout(views.html.errors.timeout()) else - InternalServerError(views.html.errors.error(exception.getMessage)) + InternalServerError(views.html.errors.error()) } } diff --git a/app/views/errors/error.scala.html b/app/views/errors/error.scala.html index a29e080a6..1dd8ba69f 100755 --- a/app/views/errors/error.scala.html +++ b/app/views/errors/error.scala.html @@ -1,7 +1,7 @@ @import db.ModelService @import db.impl.access.UserBase @import ore.{OreConfig, OreEnv} -@(message: String)(implicit messages: Messages, session: Session, request: Request[_] = null, +@()(implicit messages: Messages, session: Session, request: Request[_] = null, service: ModelService, config: OreConfig, users: UserBase, env: OreEnv) @bootstrap.layout("Error", user = false) { @@ -9,7 +9,6 @@

    Ore is experiencing difficulties.

    - @message

    If you suspect this is a bug, please take a minute to report it to the issue tracker. From ed67516e2c8c5779b2c1b4d77e9ae7f9ae869d65 Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Wed, 7 Feb 2018 22:21:19 +0100 Subject: [PATCH 49/77] Fix no elements --- app/views/projects/discuss.scala.html | 1 + app/views/projects/view.scala.html | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/projects/discuss.scala.html b/app/views/projects/discuss.scala.html index e510b0caa..61baf707d 100755 --- a/app/views/projects/discuss.scala.html +++ b/app/views/projects/discuss.scala.html @@ -36,6 +36,7 @@ @defining(model.owner) { owner => @if(owner.isOrganization + && (users.current.isDefined) && (users.current.get can PostAsOrganization in owner.toOrganization)) {

    @messages("project.discuss.postAs") diff --git a/app/views/projects/view.scala.html b/app/views/projects/view.scala.html index 9af0703c4..6bed7e0c2 100755 --- a/app/views/projects/view.scala.html +++ b/app/views/projects/view.scala.html @@ -22,9 +22,9 @@ @isOwner(user: User) = @{ user.id.get == project.ownerId } @projectRoutes = @{ controllers.project.routes.Projects } @versionRoutes = @{ controllers.project.routes.Versions } -@canAdminFlag = @{ user can ReviewFlags in project } -@canAdminNotes = @{ user can ReviewFlags in project } -@canAdminLog = @{ user can ViewLogs in project } +@canAdminFlag = @{ hasUser && (user can ReviewFlags in project) } +@canAdminNotes = @{ hasUser && (user can ReviewFlags in project) } +@canAdminLog = @{ hasUser && (user can ViewLogs in project) } @bootstrap.layout(project.ownerName + " / " + project.name) { @@ -208,7 +208,7 @@ @messages("general.download") - @if(user can ReviewProjects in project) { + @if(hasUser && (user can ReviewProjects in project)) { +@defining(project.visibility) { visible => +
    + + +
    } diff --git a/app/views/projects/view.scala.html b/app/views/projects/view.scala.html index 349a5cc40..6a61bbcc9 100755 --- a/app/views/projects/view.scala.html +++ b/app/views/projects/view.scala.html @@ -15,6 +15,8 @@ @import ore.permission.ReviewFlags @import ore.permission.ViewLogs @import ore.permission.scope.GlobalScope +@import models.project.VisibilityTypes +@import ore.permission.EditPages @(project: Project, active: String, noButtons: Boolean = false)(content: Html)(implicit messages: Messages, request: Request[_], flash: Flash, service: ModelService, config: OreConfig, users: UserBase) @@ -26,6 +28,7 @@ @canAdminFlag = @{ hasUser && (user can ReviewFlags in GlobalScope) } @canAdminNotes = @{ hasUser && (user can ReviewFlags in GlobalScope) } @canAdminLog = @{ hasUser && (user can ViewLogs in GlobalScope) } +@canEditPages = @{ hasUser && (user can EditPages in project) } @bootstrap.layout(project.ownerName + " / " + project.name) { @@ -33,6 +36,31 @@
    + @if(project.visibility != VisibilityTypes.Public) { +
    +
    + +
    +
    + }
    diff --git a/app/views/users/admin/flags.scala.html b/app/views/users/admin/flags.scala.html index 61f9b462a..96cdec0c5 100755 --- a/app/views/users/admin/flags.scala.html +++ b/app/views/users/admin/flags.scala.html @@ -34,12 +34,12 @@
    } diff --git a/app/views/projects/settings.scala.html b/app/views/projects/settings.scala.html index 27c31df44..08b3372c8 100755 --- a/app/views/projects/settings.scala.html +++ b/app/views/projects/settings.scala.html @@ -38,6 +38,26 @@

    @messages("project.settings")

    @if(userBase.current.isDefined && (userBase.current.get can HideProjects in GlobalScope)) { @projects.utils.btnHide(project, userBase.current.get) + + }
    diff --git a/app/views/projects/utils/btnHide.scala.html b/app/views/projects/utils/btnHide.scala.html index c63f150d3..717839875 100644 --- a/app/views/projects/utils/btnHide.scala.html +++ b/app/views/projects/utils/btnHide.scala.html @@ -13,7 +13,7 @@ @for(visibility <- VisibilityTypes.values.toSeq.sortBy(_.id)) { @if(user can visibility.permission in project) {
  • - + @messages("visibility.name." + visibility.nameKey) @if(project.visibility == visibility) { }
    • diff --git a/app/views/projects/view.scala.html b/app/views/projects/view.scala.html index 6a61bbcc9..580740f35 100755 --- a/app/views/projects/view.scala.html +++ b/app/views/projects/view.scala.html @@ -45,13 +45,19 @@ @if(canEditPages) {
    @messages("visibility.notice.author." + project.visibility.nameKey) - Publish + Publish } } else { @if(project.visibility == VisibilityTypes.NeedsChanges) { - @messages("visibility.notice." + project.visibility.nameKey, "Unknown") @if(canEditPages) { - Send for approval + Send for approval + } + @messages("visibility.notice." + project.visibility.nameKey) +
    + @if(project.lastVisibilityChange.isDefined) { + @project.lastVisibilityChange.get.renderComment() + } else { + Unknown } } else { @messages("visibility.notice." + project.visibility.nameKey) diff --git a/app/views/users/admin/flags.scala.html b/app/views/users/admin/flags.scala.html index 96cdec0c5..42fb499ee 100755 --- a/app/views/users/admin/flags.scala.html +++ b/app/views/users/admin/flags.scala.html @@ -75,4 +75,23 @@

    + } diff --git a/app/views/users/admin/visibility.scala.html b/app/views/users/admin/visibility.scala.html new file mode 100644 index 000000000..fa7494952 --- /dev/null +++ b/app/views/users/admin/visibility.scala.html @@ -0,0 +1,150 @@ +@import db.ModelService +@import models.project.Project +@import ore.OreConfig +@import db.impl.access.UserBase + +@(needsApproval: Seq[Project], waitingProjects: Seq[Project])(implicit messages: Messages, request: Request[_], service: ModelService, config: OreConfig, + users: UserBase) + +@projectRoutes = @{controllers.project.routes.Projects} + +@bootstrap.layout("Project Visibility") { + + + +
    +
    +
    +

    Needs Approval

    +
    +
    +
    +
    +
    +
    +

    Needs Approval

    +
    +
    +
      + @if(needsApproval.isEmpty) { +
    • +

      No projects found.

      +
      • + } + @needsApproval.map { project => + @if(project.lastChangeRequest.isDefined) { +
    • +
      +
      + + @users.get(project.lastChangeRequest.get.createdBy.getOrElse(1)).map(_.username).getOrElse("Unknown") + requested changes on + + @project.ownerName/@project.slug + + +

      + Requests: + @project.lastChangeRequest.get.renderComment() +

      +
      +
      + + @projects.utils.btnHide(project, users.current.get) + +
      +
      +
      • + } else { +
    • +
      +
      + + @users.get(project.lastVisibilityChange.get.createdBy.getOrElse(1)).map(_.username).getOrElse("Unknown") + requested changes on + + @project.ownerName/@project.slug + + +

      + No requests specified +

      +
      +
      + + @projects.utils.btnHide(project, users.current.get) + +
      +
      +
      • + } + } +
    +
    +
    +
    +
    +
    +

    Wating Changes

    +
    +
    +
    +
    +
    +
    +

    Waiting Changes

    +
    +
    +
      + @if(waitingProjects.isEmpty) { +
    • +

      No projects found.

      +
      • + } + @waitingProjects.map { project => + @if(project.lastChangeRequest.isDefined) { +
    • +
      +
      + + @users.get(project.lastVisibilityChange.get.createdBy.getOrElse(1)).map(_.username).getOrElse("Unknown") + requested changes on + + @project.ownerName/@project.slug + + +

      + Requests: + @project.lastChangeRequest.get.renderComment() +

      +
      +
      +
      • + } + } +
    +
    +
    +
    +
    + + +} diff --git a/conf/evolutions/default/87.sql b/conf/evolutions/default/87.sql new file mode 100644 index 000000000..627c541d1 --- /dev/null +++ b/conf/evolutions/default/87.sql @@ -0,0 +1,14 @@ +# --- !Ups +CREATE TABLE project_visibility_changes ( + id SERIAL PRIMARY KEY, + created_at TIMESTAMP NOT NULL DEFAULT NOW(), + created_by INT NOT NULL REFERENCES users, + project_id INT NOT NULL REFERENCES projects, + comment TEXT, + resolved_at TIMESTAMP, + resolved_by INT REFERENCES users, + visibility INT +); + +# --- !Downs +DROP TABLE project_visibility_changes; diff --git a/conf/messages b/conf/messages index f06a2c3b0..1452f487d 100755 --- a/conf/messages +++ b/conf/messages @@ -187,7 +187,8 @@ project.page.parent.info = Select a parent page (optional) project.back = Get me out of here! -project.log.title = Project Log: {0} +project.log.logger.title = Project Log +project.log.visibility.title = Visibility Log org.create = New Organization org.create.title = Create a new Organization @@ -272,7 +273,7 @@ user.flags.markResolved = Mark resolved user.flags.markAllResolved = Mark all resolved user.flags.messageUser = Message user user.flags.messageOwner = Message project owner -user.queue = Approval queue +user.queue = Version approvals user.queue.none = There are no versions to review. user.queue.approve = Approve user.queue.open = Approval queue @@ -360,6 +361,6 @@ visibility.name.softDelete = Soft deleted visibility.notice.public = None visibility.notice.new = This project is new, and the author may not have finished writing the documentation. visibility.notice.author.new = Click ''Publish'' to publish. This project will automatically be moved from the new stage in 24 hours. -visibility.notice.needsChanges = This project requires changes: {0} +visibility.notice.needsChanges = This project requires changes: visibility.notice.needsApproval = You have send the project for review visibility.notice.softDelete = Project deleted by {0}: {1} diff --git a/conf/routes b/conf/routes index f1902d002..469007e44 100755 --- a/conf/routes +++ b/conf/routes @@ -11,7 +11,8 @@ POST /admin/user/:user/update @controllers #GET /admin/reset @controllers.Application.reset() GET /admin/seed @controllers.Application.seed(users: Int ?= 200, projects: Int ?= 1, versions: Int ?= 2, channels: Int ?= 2) #GET /admin/migrate @controllers.Application.migrate() -GET /admin/queue @controllers.Application.showQueue() +GET /admin/approval/versions @controllers.Application.showQueue() +GET /admin/approval/projects @controllers.Application.showProjectVisibility() GET /admin/flags @controllers.Application.showFlags() GET /admin/flags/:id/resolve/:resolved @controllers.Application.setFlagResolved(id: Int, resolved: Boolean) GET /admin/health @controllers.Application.showHealth() diff --git a/public/javascripts/hideProject.js b/public/javascripts/hideProject.js index b4a5eb508..a451977c8 100644 --- a/public/javascripts/hideProject.js +++ b/public/javascripts/hideProject.js @@ -24,15 +24,37 @@ var ICON = 'fa-eye'; */ $(function() { - $('.btn-hide').click(function () { + $('.btn-visibility-change').click(function () { var project = $(this).data('project'); var visibilityLevel = $(this).data('level'); + var needsModal = $(this).data('modal'); var spinner = $('button[data-project="' + project + '"]').find('i'); spinner.removeClass(ICON).addClass('fa-spinner fa-spin'); + if (needsModal) { + $('.modal-title').html($(this).text().trim() + ": comment"); + $('#modal-visibility-comment').modal('show'); + $('.btn-visibility-comment-submit').data('project', project); + $('.btn-visibility-comment-submit').data('level', visibilityLevel); + spinner.addClass(ICON).removeClass('fa-spinner fa-spin'); + } else { + sendVisibilityRequest(project, visibilityLevel, '', spinner); + } + }); + + $('.btn-visibility-comment-submit').click(function () { + var project = $(this).data('project'); + var visibilityLevel = $(this).data('level'); + var spinner = $(this).find('i'); + spinner.removeClass(ICON).addClass('fa-spinner fa-spin'); + sendVisibilityRequest(project, visibilityLevel, $('.textarea-visibility-comment').val(), spinner); + + }); + + function sendVisibilityRequest(project, level, comment, spinner) { $.ajax({ type: 'post', - url: '/' + project + '/visible/' + visibilityLevel, - data: { csrfToken: csrf }, + url: '/' + project + '/visible/' + level, + data: { csrfToken: csrf, comment: comment }, fail: function () { spinner.addClass(ICON).removeClass('fa-spinner fa-spin'); }, @@ -41,5 +63,5 @@ $(function() { location.reload(); } }); - }); + } }); From 3d830e8a084cca1ae23f61943eb77acadaa26a34 Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Tue, 20 Feb 2018 19:20:27 +0100 Subject: [PATCH 60/77] Make delete soft-delete --- app/controllers/project/Projects.scala | 23 ++++++++++++-- app/ore/permission/Permission.scala | 1 + app/views/projects/settings.scala.html | 23 ++++++++++++-- app/views/projects/view.scala.html | 33 ++++++++++++--------- app/views/users/admin/visibility.scala.html | 6 +++- conf/evolutions/default/88.sql | 6 ++++ conf/messages | 4 +-- conf/routes | 3 +- public/javascripts/hideProject.js | 3 +- 9 files changed, 77 insertions(+), 25 deletions(-) create mode 100644 conf/evolutions/default/88.sql diff --git a/app/controllers/project/Projects.scala b/app/controllers/project/Projects.scala index 5de59e478..a3ffb3502 100755 --- a/app/controllers/project/Projects.scala +++ b/app/controllers/project/Projects.scala @@ -506,7 +506,7 @@ class Projects @Inject()(stats: StatTracker, andThen ProjectPermissionAction(HideProjects)) { implicit request => val newVisibility = VisibilityTypes.withId(visibility) if (request.user can newVisibility.permission in GlobalScope) { - if (visibility == VisibilityTypes.NeedsChanges.id) { + if (newVisibility.showModal) { val comment = this.forms.NeedsChanges.bindFromRequest.get.trim request.project.setVisibility(newVisibility, comment, request.user) } else { @@ -560,9 +560,26 @@ class Projects @Inject()(stats: StatTracker, * @param slug Project slug * @return Home page */ - def delete(author: String, slug: String) = SettingsEditAction(author, slug) { implicit request => + def delete(author: String, slug: String) = { + (Authenticated andThen PermissionAction[AuthRequest](HardRemoveProject)) { implicit request => + withProject(author, slug) { project => + this.projects.delete(project) + Redirect(ShowHome).withSuccess(this.messagesApi("project.deleted", project.name)) + } + } + } + + /** + * Soft deletes the specified project. + * + * @param author Project owner + * @param slug Project slug + * @return Home page + */ + def softDelete(author: String, slug: String) = SettingsEditAction(author, slug) { implicit request => val project = request.project - this.projects.delete(project) + val comment = this.forms.NeedsChanges.bindFromRequest.get.trim + project.setVisibility(VisibilityTypes.SoftDelete, comment, request.user) Redirect(ShowHome).withSuccess(this.messagesApi("project.deleted", project.name)) } diff --git a/app/ore/permission/Permission.scala b/app/ore/permission/Permission.scala index bc8dc4438..02e09063e 100644 --- a/app/ore/permission/Permission.scala +++ b/app/ore/permission/Permission.scala @@ -11,6 +11,7 @@ case object EditPages extends Permission { val trust = Limited } case object EditSettings extends Permission { val trust = Lifted } case object EditVersions extends Permission { val trust = Standard } case object HideProjects extends Permission { val trust = Standard } +case object HardRemoveProject extends Permission { val trust = Absolute } case object ReviewFlags extends Permission { val trust = Standard } case object ReviewProjects extends Permission { val trust = Standard } case object ReviewVisibility extends Permission { val trust = Standard } diff --git a/app/views/projects/settings.scala.html b/app/views/projects/settings.scala.html index 08b3372c8..4d8b6a3e1 100755 --- a/app/views/projects/settings.scala.html +++ b/app/views/projects/settings.scala.html @@ -8,6 +8,7 @@ @import security.NonceFilter._ @import views.html.helper.{CSRF, form} @import ore.rest.ProjectApiKeyTypes._ +@import ore.permission.HardRemoveProject @(project: Project)(implicit messages: Messages, flash: Flash, request: Request[_], service: ModelService, config: OreConfig, userBase: UserBase) @@ -183,6 +184,21 @@

    Delete

    + @if(userBase.current.isDefined && (userBase.current.get can HardRemoveProject in GlobalScope)) { +
    +
    +

    Hard Delete

    +

    Once you delete a project, it cannot be recovered.

    +
    +
    + +
    +
    +
    + } + @form(action = projectRoutes.save(project.ownerName, project.slug), 'id -> "save", 'class -> "pull-right") { @CSRF.formField @@ -247,21 +263,22 @@

    + @form(action = projectRoutes.softDelete(project.ownerName, project.slug)) {
    - @messages("project.delete.info") + @messages("project.delete.info") +
    - @form(action = projectRoutes.delete(project.ownerName, project.slug)) { @CSRF.formField - }
    + }
    diff --git a/app/views/projects/view.scala.html b/app/views/projects/view.scala.html index 580740f35..82a9302f1 100755 --- a/app/views/projects/view.scala.html +++ b/app/views/projects/view.scala.html @@ -47,22 +47,27 @@ @messages("visibility.notice.author." + project.visibility.nameKey) Publish } - } else { - @if(project.visibility == VisibilityTypes.NeedsChanges) { - @if(canEditPages) { - Send for approval - } - @messages("visibility.notice." + project.visibility.nameKey) -
    - @if(project.lastVisibilityChange.isDefined) { - @project.lastVisibilityChange.get.renderComment() - } else { - Unknown - } + } else { @if(project.visibility == VisibilityTypes.NeedsChanges) { + @if(canEditPages) { + Send for approval + } + @messages("visibility.notice." + project.visibility.nameKey) +
    + @if(project.lastVisibilityChange.isDefined) { + @project.lastVisibilityChange.get.renderComment() } else { - @messages("visibility.notice." + project.visibility.nameKey) + Unknown } - } + } else { @if(project.visibility == VisibilityTypes.SoftDelete) { + @if(project.lastVisibilityChange.isDefined) { + @messages("visibility.notice." + project.visibility.nameKey, users.get(project.lastVisibilityChange.get.createdBy.get).map(_.username).getOrElse("Unknown")) + @project.lastVisibilityChange.get.renderComment() + } else { + @messages("visibility.notice." + project.visibility.nameKey, "Unknown") + } + } else { + @messages("visibility.notice." + project.visibility.nameKey) + }}} diff --git a/app/views/users/admin/visibility.scala.html b/app/views/users/admin/visibility.scala.html index fa7494952..b917126d8 100644 --- a/app/views/users/admin/visibility.scala.html +++ b/app/views/users/admin/visibility.scala.html @@ -60,7 +60,11 @@

    Needs Approval

    - @users.get(project.lastVisibilityChange.get.createdBy.getOrElse(1)).map(_.username).getOrElse("Unknown") + @if(project.lastVisibilityChange.isDefined) { + @users.get(project.lastVisibilityChange.get.createdBy.getOrElse(1)).map(_.username).getOrElse("Unknown") + } else { + Unknown + } requested changes on @project.ownerName/@project.slug diff --git a/conf/evolutions/default/88.sql b/conf/evolutions/default/88.sql new file mode 100644 index 000000000..b75ddc192 --- /dev/null +++ b/conf/evolutions/default/88.sql @@ -0,0 +1,6 @@ +# --- !Ups +ALTER TABLE project_visibility_changes DROP CONSTRAINT project_visibility_changes_project_id_fkey; +ALTER TABLE project_visibility_changes ADD CONSTRAINT project_visibility_changes_project_id_fkey FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE; + +# --- !Downs +DROP TABLE project_visibility_changes; diff --git a/conf/messages b/conf/messages index 1452f487d..8ce953cac 100755 --- a/conf/messages +++ b/conf/messages @@ -128,7 +128,7 @@ project.author = Author project.category = Category project.category.plural = Categories project.delete.title = Delete project -project.delete.info = Are you sure you want to delete your Project? This action cannot be undone. +project.delete.info = Are you sure you want to delete your Project? This action cannot be undone. Please explain why you want to delete it. project.download.recommend = Download the latest recommended version project.download.recommend.warn = This project's recommended version has not been reviewed by our moderation staff and may not be safe for download. project.download.warn = This version has not been reviewed by our moderation staff and may not be safe for download. @@ -363,4 +363,4 @@ visibility.notice.new = This project is new, and the author may not ha visibility.notice.author.new = Click ''Publish'' to publish. This project will automatically be moved from the new stage in 24 hours. visibility.notice.needsChanges = This project requires changes: visibility.notice.needsApproval = You have send the project for review -visibility.notice.softDelete = Project deleted by {0}: {1} +visibility.notice.softDelete = Project deleted by {0} diff --git a/conf/routes b/conf/routes index 469007e44..ea1112063 100755 --- a/conf/routes +++ b/conf/routes @@ -121,7 +121,8 @@ GET /:author/:slug/manage/publish @controllers GET /:author/:slug/manage/sendforapproval @controllers.project.Projects.sendForApproval(author, slug) POST /:author/:slug/manage/save @controllers.project.Projects.save(author, slug) POST /:author/:slug/manage/rename @controllers.project.Projects.rename(author, slug) -POST /:author/:slug/manage/delete @controllers.project.Projects.delete(author, slug) +POST /:author/:slug/manage/hardDelete @controllers.project.Projects.delete(author, slug) +POST /:author/:slug/manage/delete @controllers.project.Projects.softDelete(author, slug) POST /:author/:slug/manage/members/remove @controllers.project.Projects.removeMember(author, slug) GET /:author/:slug/log @controllers.project.Projects.showLog(author, slug) diff --git a/public/javascripts/hideProject.js b/public/javascripts/hideProject.js index a451977c8..506f69c45 100644 --- a/public/javascripts/hideProject.js +++ b/public/javascripts/hideProject.js @@ -51,9 +51,10 @@ $(function() { }); function sendVisibilityRequest(project, level, comment, spinner) { + var _url = '/' + project + (level == -99 ? '/manage/hardDelete' : '/visible/' + level); $.ajax({ type: 'post', - url: '/' + project + '/visible/' + level, + url: _url, data: { csrfToken: csrf, comment: comment }, fail: function () { spinner.addClass(ICON).removeClass('fa-spinner fa-spin'); From a322b2b7a3a3653583618ae1b2ce413c931449ad Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Wed, 21 Feb 2018 22:04:17 +0100 Subject: [PATCH 61/77] Fix evolution breaking things --- conf/evolutions/default/88.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/evolutions/default/88.sql b/conf/evolutions/default/88.sql index b75ddc192..95b9438ac 100644 --- a/conf/evolutions/default/88.sql +++ b/conf/evolutions/default/88.sql @@ -3,4 +3,5 @@ ALTER TABLE project_visibility_changes DROP CONSTRAINT project_visibility_change ALTER TABLE project_visibility_changes ADD CONSTRAINT project_visibility_changes_project_id_fkey FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE; # --- !Downs -DROP TABLE project_visibility_changes; +ALTER TABLE project_visibility_changes DROP CONSTRAINT project_visibility_changes_project_id_fkey; +ALTER TABLE project_visibility_changes ADD CONSTRAINT project_visibility_changes_project_id_fkey FOREIGN KEY (project_id) REFERENCES projects(id); From 7fd18b1de5cf7c29da00da683d40448db1a8424f Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Wed, 21 Feb 2018 18:28:50 +0100 Subject: [PATCH 62/77] Add WikiLinks, Fix #421 and #265 --- app/controllers/project/Pages.scala | 61 ++++++++++++++++++++---- app/db/impl/schema/PageSchema.scala | 2 +- app/models/project/Page.scala | 52 ++++++++++++++++---- app/ore/rest/OreRestfulApi.scala | 9 +++- app/views/projects/pages/view.scala.html | 5 +- build.sbt | 15 +++--- conf/evolutions/default/89.sql | 13 +++++ conf/routes | 8 ++-- public/javascripts/pageCollapse.js | 2 +- public/javascripts/pageEdit.js | 2 + 10 files changed, 136 insertions(+), 33 deletions(-) create mode 100644 conf/evolutions/default/89.sql diff --git a/app/controllers/project/Pages.scala b/app/controllers/project/Pages.scala index d250eef7a..e8ff0cb34 100755 --- a/app/controllers/project/Pages.scala +++ b/app/controllers/project/Pages.scala @@ -4,9 +4,10 @@ import javax.inject.Inject import controllers.BaseController import controllers.sugar.Bakery -import db.ModelService +import db.impl.OrePostgresDriver.api._ +import db.{ModelFilter, ModelService} import form.OreForms -import models.project.Page +import models.project.{Page, Project} import ore.permission.EditPages import ore.{OreConfig, OreEnv, StatTracker} import play.api.i18n.MessagesApi @@ -33,6 +34,29 @@ class Pages @Inject()(forms: OreForms, private def PageEditAction(author: String, slug: String) = AuthedProjectAction(author, slug, requireUnlock = true) andThen ProjectPermissionAction(EditPages) + /** + * Return the best guess of the page + * + * @param project + * @param page + * @return Tuple: Optional Page, true if using legacy fallback + */ + def withPage(project: Project, page: String): (Option[Page], Boolean) = { + val parts = page.split("/") + if (parts.size == 2) { + val parentId = project.pages.find(equalsIgnoreCase(_.name, parts(0))).map(_.id.getOrElse(-1)).getOrElse(-1) + val pages: Seq[Page] = project.pages.filter(equalsIgnoreCase(_.name, parts(1))).seq + (pages.find(_.parentId == parentId), false) + } else { + val result = project.pages.find((ModelFilter[Page](_.name === parts(0)) +&& ModelFilter[Page](_.parentId === -1)).fn) + if (!result.isDefined) { + (project.pages.find((ModelFilter[Page](_.name === parts(0))).fn), true) + } else { + (result, false) + } + } + } + /** * Displays the specified page. * @@ -43,9 +67,11 @@ class Pages @Inject()(forms: OreForms, */ def show(author: String, slug: String, page: String) = ProjectAction(author, slug) { implicit request => val project = request.project - project.pages.find(equalsIgnoreCase(_.name, page)) match { - case None => notFound - case Some(p) => this.stats.projectViewed(implicit request => Ok(views.view(project, p))) + val optionPage = withPage(project, page) + if (optionPage._1.isDefined) { + this.stats.projectViewed(implicit request => Ok(views.view(project, optionPage._1.get, optionPage._2))) + } else { + notFound } } @@ -60,7 +86,15 @@ class Pages @Inject()(forms: OreForms, */ def showEditor(author: String, slug: String, page: String) = PageEditAction(author, slug) { implicit request => val project = request.project - Ok(views.view(project, project.getOrCreatePage(page), editorOpen = true)) + val parts = page.split("/") + var pageName = parts(0) + var parentId = -1 + if (parts.size == 2) { + pageName = parts(1) + parentId = project.pages.find(equalsIgnoreCase(_.name, parts(0))).map(_.id.getOrElse(-1)).getOrElse(-1) + } + val pageModel = project.getOrCreatePage(pageName, parentId) + Ok(views.view(project, pageModel, editorOpen = true)) } /** @@ -86,7 +120,7 @@ class Pages @Inject()(forms: OreForms, Redirect(self.show(author, slug, page)).withError(hasErrors.errors.head.message), pageData => { val project = request.project - val parentId = pageData.parentId.getOrElse(-1) + var parentId = pageData.parentId.getOrElse(-1) //noinspection ComparingUnrelatedTypes if (parentId != -1 && !project.rootPages.filterNot(_.name.equals(Page.HomeName)).exists(_.id.get == parentId)) { BadRequest("Invalid parent ID.") @@ -95,7 +129,13 @@ class Pages @Inject()(forms: OreForms, if (page.equals(Page.HomeName) && (content.isEmpty || content.get.length < Page.MinLength)) { Redirect(self.show(author, slug, page)).withError("error.minLength") } else { - val pageModel = project.getOrCreatePage(page, parentId) + val parts = page.split("/") + var pageName = parts(0) + if (parts.size == 2) { + pageName = parts(1) + parentId = project.pages.find(equalsIgnoreCase(_.name, parts(0))).map(_.id.getOrElse(-1)).getOrElse(-1) + } + val pageModel = project.getOrCreatePage(pageName, parentId) pageData.content.map(pageModel.contents = _) Redirect(self.show(author, slug, page)) } @@ -114,7 +154,10 @@ class Pages @Inject()(forms: OreForms, */ def delete(author: String, slug: String, page: String) = PageEditAction(author, slug) { implicit request => val project = request.project - this.service.access[Page](classOf[Page]).remove(project.pages.find(equalsIgnoreCase(_.name, page)).get) + val optionPage = withPage(project, page) + if (optionPage._1.isDefined) + this.service.access[Page](classOf[Page]).remove(optionPage._1.get) + Redirect(routes.Projects.show(author, slug)) } diff --git a/app/db/impl/schema/PageSchema.scala b/app/db/impl/schema/PageSchema.scala index 8953ddde8..8b63a3388 100644 --- a/app/db/impl/schema/PageSchema.scala +++ b/app/db/impl/schema/PageSchema.scala @@ -15,7 +15,7 @@ class PageSchema(override val service: ModelService) override def like(page: Page): Future[Option[Page]] = { this.service.find[Page](this.modelClass, p => - p.projectId === page.projectId && p.name.toLowerCase === page.name.toLowerCase + p.projectId === page.projectId && p.name.toLowerCase === page.name.toLowerCase && p.parentId === page.parentId ) } diff --git a/app/models/project/Page.scala b/app/models/project/Page.scala index f65ac210f..4c56c682c 100644 --- a/app/models/project/Page.scala +++ b/app/models/project/Page.scala @@ -11,10 +11,11 @@ import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughExtension import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension import com.vladsch.flexmark.ext.tables.TablesExtension import com.vladsch.flexmark.ext.typographic.TypographicExtension -import com.vladsch.flexmark.html.renderer.{LinkStatus, LinkType, NodeRendererContext, ResolvedLink} +import com.vladsch.flexmark.ext.wikilink.{WikiLink, WikiLinkExtension} +import com.vladsch.flexmark.html.renderer._ import com.vladsch.flexmark.html.{HtmlRenderer, LinkResolver, LinkResolverFactory} import com.vladsch.flexmark.parser.Parser -import com.vladsch.flexmark.util.options.MutableDataSet +import com.vladsch.flexmark.util.options.{MutableDataHolder, MutableDataSet} import db.access.ModelAccess import db.impl.OrePostgresDriver.api._ import db.impl.PageTable @@ -22,6 +23,7 @@ import db.impl.model.OreModel import db.impl.schema.PageSchema import db.impl.table.ModelKeys._ import db.{ModelFilter, Named} +import models.project import ore.permission.scope.ProjectScope import ore.{OreConfig, Visitable} import play.twirl.api.Html @@ -99,14 +101,34 @@ case class Page(override val id: Option[Int] = None, * * @return HTML representation */ - def html: Html = Render(this.contents) + def html: Html = RenderPage(this) /** * Returns true if this is the home page. * * @return True if home page */ - def isHome: Boolean = this.name.equals(HomeName) + def isHome: Boolean = this.name.equals(HomeName) && parentId == -1 + + /** + * Get Project associated with page. + * + * @return Optional Project + */ + def parentProject: Option[Project] = this.projectBase.get(projectId) + + /** + * + * @return + */ + def parentPage: Option[Page] = if (parentProject.isDefined) { parentProject.get.pages.find(ModelFilter[Page](_.id === parentId).fn).lastOption } else { None } + + /** + * Get the /:parent/:child + * + * @return String + */ + def fullSlug: String = if (parentPage.isDefined) { s"${parentPage.get.name}/${slug}" } else { slug } /** * Returns access to this Page's children (if any). @@ -116,7 +138,7 @@ case class Page(override val id: Option[Int] = None, def children: ModelAccess[Page] = this.service.access[Page](classOf[Page], ModelFilter[Page](_.parentId === this.id.get)) - override def url: String = this.project.url + "/pages/" + this.slug + override def url: String = this.project.url + "/pages/" + this.fullSlug override def copyWith(id: Option[Int], theTime: Option[Timestamp]) = this.copy(id = id, createdAt = theTime) } @@ -132,13 +154,13 @@ object Page { override def affectsGlobalScope() = false - override def create(context: NodeRendererContext) = new ExternalLinkResolver(this.config) + override def create(context: LinkResolverContext) = new ExternalLinkResolver(this.config) } } private class ExternalLinkResolver(config: OreConfig) extends LinkResolver { - override def resolveLink(node: Node, context: NodeRendererContext, link: ResolvedLink): ResolvedLink = { + override def resolveLink(node: Node, context: LinkResolverContext, link: ResolvedLink): ResolvedLink = { if (link.getLinkType.equals(LinkType.IMAGE) || node.isInstanceOf[MailLink]) { link } else { @@ -191,7 +213,8 @@ object Page { StrikethroughExtension.create(), TaskListExtension.create(), TablesExtension.create(), - TypographicExtension.create() + TypographicExtension.create(), + WikiLinkExtension.create() )) (Parser.builder(options).build(), HtmlRenderer.builder(options) @@ -206,6 +229,19 @@ object Page { Html(htmlRenderer.render(markdownParser.parse(markdown))) } + def RenderPage(page: Page)(implicit config: OreConfig): Html = { + if (linkResolver.isEmpty) + linkResolver = Some(new ExternalLinkResolver.Factory(config)) + + val options = new MutableDataSet().set[String](WikiLinkExtension.LINK_ESCAPE_CHARS, " +<>") + val project = page.parentProject + + if (project.isDefined) + options.set[String](WikiLinkExtension.LINK_PREFIX, s"/${project.get.ownerName}/${project.get.slug}/pages/") + + Html(htmlRenderer.withOptions(options).render(markdownParser.parse(page._contents))) + } + /** * The name of each Project's homepage. */ diff --git a/app/ore/rest/OreRestfulApi.scala b/app/ore/rest/OreRestfulApi.scala index c42c2b4e8..82d3261ee 100755 --- a/app/ore/rest/OreRestfulApi.scala +++ b/app/ore/rest/OreRestfulApi.scala @@ -119,7 +119,14 @@ trait OreRestfulApi { } else { result = pages.toSeq } - result + Some(toJson(result.map(page => obj( + "createdAt" -> page.createdAt, + "id" -> page.id, + "name" -> page.name, + "parentId" -> page.parentId, + "slug" -> page.slug, + "fullSlug" -> page.fullSlug + )))) } map { toJson(_) } diff --git a/app/views/projects/pages/view.scala.html b/app/views/projects/pages/view.scala.html index 8553fe24a..89c1b13b6 100755 --- a/app/views/projects/pages/view.scala.html +++ b/app/views/projects/pages/view.scala.html @@ -15,11 +15,12 @@ @import models.project.Page @(model: Project, page: Page, + forceHideEditor: Boolean = false, editorOpen: Boolean = false)(implicit messages: Messages, request: Request[_], flash: Flash, service: ModelService, config: OreConfig, userBase: UserBase) @canEditPages = @{ - userBase.current.isDefined && (userBase.current.get can EditPages in model) + userBase.current.isDefined && (userBase.current.get can EditPages in model) && !forceHideEditor } @projects.view(model, "#docs") { @@ -98,7 +99,7 @@

    @messages("page.plural")

     } } - + @pg.name diff --git a/build.sbt b/build.sbt index f036c124f..6050d2f1c 100755 --- a/build.sbt +++ b/build.sbt @@ -32,13 +32,14 @@ libraryDependencies ++= Seq( "org.bouncycastle" % "bcpg-jdk15on" % "1.56", "javax.mail" % "mail" % "1.4.7", - "com.vladsch.flexmark" % "flexmark" % "0.18.2", - "com.vladsch.flexmark" % "flexmark-ext-autolink" % "0.18.2", - "com.vladsch.flexmark" % "flexmark-ext-anchorlink" % "0.18.2", - "com.vladsch.flexmark" % "flexmark-ext-gfm-strikethrough" % "0.18.2", - "com.vladsch.flexmark" % "flexmark-ext-gfm-tasklist" % "0.18.2", - "com.vladsch.flexmark" % "flexmark-ext-tables" % "0.18.2", - "com.vladsch.flexmark" % "flexmark-ext-typographic" % "0.18.2", + "com.vladsch.flexmark" % "flexmark" % "0.32.4", + "com.vladsch.flexmark" % "flexmark-ext-autolink" % "0.32.4", + "com.vladsch.flexmark" % "flexmark-ext-anchorlink" % "0.32.4", + "com.vladsch.flexmark" % "flexmark-ext-gfm-strikethrough" % "0.32.4", + "com.vladsch.flexmark" % "flexmark-ext-gfm-tasklist" % "0.32.4", + "com.vladsch.flexmark" % "flexmark-ext-tables" % "0.32.4", + "com.vladsch.flexmark" % "flexmark-ext-typographic" % "0.32.4", + "com.vladsch.flexmark" % "flexmark-ext-wikilink" % "0.32.4", "org.webjars" % "jquery" % "2.2.4", "org.webjars" % "font-awesome" % "4.7.0", diff --git a/conf/evolutions/default/89.sql b/conf/evolutions/default/89.sql new file mode 100644 index 000000000..be694ecce --- /dev/null +++ b/conf/evolutions/default/89.sql @@ -0,0 +1,13 @@ +# --- !Ups +ALTER TABlE project_pages DROP CONSTRAINT IF EXISTS pages_project_id_name_key; +ALTER TABlE project_pages DROP CONSTRAINT IF EXISTS pages_project_id_slug_key; + +# --- !Downs +DELETE FROM project_pages WHERE (project_id, slug) IN + (SELECT project_id, slug FROM project_pages GROUP BY project_id, slug HAVING COUNT(*) > 1); + +DELETE FROM project_pages WHERE (project_id, name) IN + (SELECT project_id, name FROM project_pages GROUP BY project_id, name HAVING COUNT(*) > 1); + +ALTER TABlE project_pages ADD CONSTRAINT pages_project_id_name_key UNIQUE(project_id, name); +ALTER TABlE project_pages ADD CONSTRAINT pages_project_id_slug_key UNIQUE(project_id, slug); diff --git a/conf/routes b/conf/routes index ea1112063..c4863e525 100755 --- a/conf/routes +++ b/conf/routes @@ -142,10 +142,10 @@ GET /:author/:slug/icon/pending @controllers # ---------- Pages ---------- -GET /:author/:slug/pages/:page/edit @controllers.project.Pages.showEditor(author, slug, page) -POST /:author/:slug/pages/:page/edit @controllers.project.Pages.save(author, slug, page) -POST /:author/:slug/pages/:page/delete @controllers.project.Pages.delete(author, slug, page) -GET /:author/:slug/pages/:page @controllers.project.Pages.show(author, slug, page) +GET /:author/:slug/pages/*page/edit @controllers.project.Pages.showEditor(author, slug, page) +POST /:author/:slug/pages/*page/edit @controllers.project.Pages.save(author, slug, page) +POST /:author/:slug/pages/*page/delete @controllers.project.Pages.delete(author, slug, page) +GET /:author/:slug/pages/*page @controllers.project.Pages.show(author, slug, page) # ---------- Channels ---------- diff --git a/public/javascripts/pageCollapse.js b/public/javascripts/pageCollapse.js index d3faee137..6567a5009 100644 --- a/public/javascripts/pageCollapse.js +++ b/public/javascripts/pageCollapse.js @@ -22,7 +22,7 @@ function bindExpand(e) { '' ); var link = childPage.find('a'); - link.attr("href", '/' + namespace + '/pages/' + page.name); + link.attr("href", '/' + namespace + '/pages/' + page.fullSlug); link.text(page.name); // this will sanitize the input div.append(childPage); } diff --git a/public/javascripts/pageEdit.js b/public/javascripts/pageEdit.js index c2b3c4600..b23f0ed0a 100644 --- a/public/javascripts/pageEdit.js +++ b/public/javascripts/pageEdit.js @@ -49,6 +49,8 @@ $(function() { var parentId = -1; if (parent.length) { parentId = parent.val(); + if (parentId != -1) + url = '/' + PROJECT_OWNER + '/' + PROJECT_SLUG + '/pages/' + parent.text() + '/' + pageName + '/edit'; } $.ajax({ method: 'post', From 456cceb4b899fa4c4a22d9f235718f499cab8a38 Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Thu, 22 Feb 2018 19:58:05 +0100 Subject: [PATCH 63/77] Fix #445 --- app/views/users/admin/reviews.scala.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/views/users/admin/reviews.scala.html b/app/views/users/admin/reviews.scala.html index e8f6e553a..001d20826 100644 --- a/app/views/users/admin/reviews.scala.html +++ b/app/views/users/admin/reviews.scala.html @@ -10,6 +10,9 @@ @(reviews: Seq[Review])(implicit messages: Messages, request: Request[_], service: ModelService, config: OreConfig, users: UserBase, project: Project, version: Version) +@projectRoutes = @{controllers.project.routes.Projects} +@versionRoutes = @{controllers.project.routes.Versions} + @bootstrap.layout(messages("review.title")) { @@ -28,6 +31,10 @@

    @project.name @version.versionString

    @if(!version.isReviewed) {
    + + Project Page + Download File + @if(version.mostRecentUnfinishedReview.isDefined) { @if(users.current == users.get(version.mostRecentUnfinishedReview.get.userId)) { From 2ca0d4623cee0834da1ac6ba16742c9351a586f5 Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Thu, 22 Feb 2018 21:38:53 +0100 Subject: [PATCH 64/77] Fix #446 --- app/views/users/admin/activity.scala.html | 4 ++-- app/views/users/admin/queue.scala.html | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/views/users/admin/activity.scala.html b/app/views/users/admin/activity.scala.html index bbae7f6f5..631d2b2a8 100644 --- a/app/views/users/admin/activity.scala.html +++ b/app/views/users/admin/activity.scala.html @@ -38,7 +38,7 @@

    @messages("activity.title")

    @activities.map { tuple => @if(tuple._1.isInstanceOf[Review]) { - Review approved: + Review approved @prettifyDateAndTime(tuple._1.asInstanceOf[Review].endedAt.getOrElse(Timestamp.from(Instant.EPOCH))) for: @if(tuple._2.isDefined) { @@ -52,7 +52,7 @@

    @messages("activity.title")

    } @if(tuple._1.isInstanceOf[Flag]) { - Flag resolved: + Flag resolved @prettifyDateAndTime(tuple._1.asInstanceOf[Flag].resolvedAt.getOrElse(Timestamp.from(Instant.EPOCH))) for: @if(tuple._2.isDefined) { diff --git a/app/views/users/admin/queue.scala.html b/app/views/users/admin/queue.scala.html index e18d5c777..ae22817ef 100755 --- a/app/views/users/admin/queue.scala.html +++ b/app/views/users/admin/queue.scala.html @@ -10,6 +10,8 @@ @(underReview: Seq[(Project, Version)], versions: Seq[(Project, Version)])(implicit messages: Messages, request: Request[_], service: ModelService, config: OreConfig, users: UserBase) +@import java.sql.Timestamp +@import java.time.Instant @versionRoutes = @{controllers.project.routes.Versions} @currentUserId = @{users.current.get.id.get} @@ -66,6 +68,8 @@

    @messages("queue.review.none")

    @tuple._2.author.get.name + } else { + Unknown }
    @prettifyDateAndTime(tuple._2.createdAt.get) @@ -85,11 +89,11 @@

    @messages("queue.review.none")

    @if(currentReview.isDefined) { @users.get(currentReview.get.userId).get.name
    - + } else { @users.get(tuple._2.mostRecentReviews.last.userId).get.name
    - + } From 075492aa4081cde4bff63a9e3f8e5e6c6b49f925 Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Mon, 26 Feb 2018 20:32:09 +0100 Subject: [PATCH 65/77] Add trigger to clean old project_views --- conf/evolutions/default/90.sql | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 conf/evolutions/default/90.sql diff --git a/conf/evolutions/default/90.sql b/conf/evolutions/default/90.sql new file mode 100644 index 000000000..2715f32a0 --- /dev/null +++ b/conf/evolutions/default/90.sql @@ -0,0 +1,20 @@ +# --- !Ups + +CREATE OR REPLACE FUNCTION delete_old_project_views() + RETURNS trigger AS +$$ +BEGIN + DELETE FROM project_views WHERE created_at < current_date - interval '30' day;; + RETURN NEW;; +END +$$ LANGUAGE plpgsql; + +CREATE TRIGGER clean_old_project_views AFTER INSERT + ON project_views + FOR EACH STATEMENT +EXECUTE PROCEDURE delete_old_project_views(); + +# --- !Downs + +DROP TRIGGER clean_old_project_views ON project_views; +DROP FUNCTION delete_old_project_views(); From 7fb278fb47400e9cf1644f3ca1a98564b489f6d5 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Mon, 26 Feb 2018 15:42:16 -0500 Subject: [PATCH 66/77] Bump version for release --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6050d2f1c..39a039e5c 100755 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ name := "ore" -version := "1.5.5" +version := "1.5.6" lazy val `ore` = (project in file(".")).enablePlugins(PlayScala) From 5d11df1d3ebaee955739e30533fe5975cc5fa00c Mon Sep 17 00:00:00 2001 From: Jadon Fowler Date: Mon, 26 Feb 2018 21:42:03 -0800 Subject: [PATCH 67/77] Remove Privileges from non-Ore Roles They don't need any permissions. Closes #454 Signed-off-by: Jadon Fowler --- app/ore/permission/role/RoleTypes.scala | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/ore/permission/role/RoleTypes.scala b/app/ore/permission/role/RoleTypes.scala index a59a7226c..d9370af9d 100644 --- a/app/ore/permission/role/RoleTypes.scala +++ b/app/ore/permission/role/RoleTypes.scala @@ -17,14 +17,14 @@ object RoleTypes extends Enumeration { val Admin = new RoleType( 0, 61, classOf[GlobalRole], Absolute, "Ore Admin", Red) val Mod = new RoleType( 1, 62, classOf[GlobalRole], Lifted, "Ore Moderator", Aqua) - val SpongeLeader = new RoleType( 2, 44, classOf[GlobalRole], Absolute, "Sponge Leader", Amber) - val TeamLeader = new RoleType( 3, 58, classOf[GlobalRole], Standard, "Team Leader", Amber) - val CommunityLeader = new RoleType( 4, 59, classOf[GlobalRole], Standard, "Community Leader", Amber) - val Staff = new RoleType( 5, 3, classOf[GlobalRole], Standard, "Sponge Staff", Amber) - val SpongeDev = new RoleType( 6, 41, classOf[GlobalRole], Standard, "Sponge Developer", Green) - val WebDev = new RoleType( 7, 45, classOf[GlobalRole], Standard, "Web Developer", Blue) - val Scribe = new RoleType( 8, 51, classOf[GlobalRole], Limited, "Sponge Documenter", Aqua) - val Support = new RoleType( 9, 43, classOf[GlobalRole], Limited, "Sponge Support", Aqua) + val SpongeLeader = new RoleType( 2, 44, classOf[GlobalRole], Default, "Sponge Leader", Amber) + val TeamLeader = new RoleType( 3, 58, classOf[GlobalRole], Default, "Team Leader", Amber) + val CommunityLeader = new RoleType( 4, 59, classOf[GlobalRole], Default, "Community Leader", Amber) + val Staff = new RoleType( 5, 3, classOf[GlobalRole], Default, "Sponge Staff", Amber) + val SpongeDev = new RoleType( 6, 41, classOf[GlobalRole], Default, "Sponge Developer", Green) + val WebDev = new RoleType( 7, 45, classOf[GlobalRole], Default, "Web Developer", Blue) + val Scribe = new RoleType( 8, 51, classOf[GlobalRole], Default, "Sponge Documenter", Aqua) + val Support = new RoleType( 9, 43, classOf[GlobalRole], Default, "Sponge Support", Aqua) val Contributor = new RoleType(10, 49, classOf[GlobalRole], Default, "Sponge Contributor", Green) val Adviser = new RoleType(11, 48, classOf[GlobalRole], Default, "Sponge Adviser", Aqua) From 64168f17785a44bd6c189ebba6190f9b75aa4460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Kleinekath=C3=B6fer?= Date: Tue, 27 Feb 2018 16:04:18 +0100 Subject: [PATCH 68/77] Fixed wiki link special characters edge case Co-authored-by: Ewout Van Schil --- app/controllers/project/Pages.scala | 21 ++++++++++--------- app/form/OreForms.scala | 1 + app/form/project/PageSaveForm.scala | 2 +- app/models/project/Page.scala | 2 +- .../projects/pages/modalPageCreate.scala.html | 2 +- app/views/projects/pages/view.scala.html | 9 ++++---- app/views/utils/editor.scala.html | 6 +++++- public/javascripts/main.js | 4 ++++ public/javascripts/pageEdit.js | 6 +++--- 9 files changed, 32 insertions(+), 21 deletions(-) diff --git a/app/controllers/project/Pages.scala b/app/controllers/project/Pages.scala index e8ff0cb34..dce447981 100755 --- a/app/controllers/project/Pages.scala +++ b/app/controllers/project/Pages.scala @@ -44,13 +44,13 @@ class Pages @Inject()(forms: OreForms, def withPage(project: Project, page: String): (Option[Page], Boolean) = { val parts = page.split("/") if (parts.size == 2) { - val parentId = project.pages.find(equalsIgnoreCase(_.name, parts(0))).map(_.id.getOrElse(-1)).getOrElse(-1) - val pages: Seq[Page] = project.pages.filter(equalsIgnoreCase(_.name, parts(1))).seq + val parentId = project.pages.find(equalsIgnoreCase(_.slug, parts(0))).map(_.id.getOrElse(-1)).getOrElse(-1) + val pages: Seq[Page] = project.pages.filter(equalsIgnoreCase(_.slug, parts(1))).seq (pages.find(_.parentId == parentId), false) } else { - val result = project.pages.find((ModelFilter[Page](_.name === parts(0)) +&& ModelFilter[Page](_.parentId === -1)).fn) - if (!result.isDefined) { - (project.pages.find((ModelFilter[Page](_.name === parts(0))).fn), true) + val result = project.pages.find((ModelFilter[Page](_.slug === parts(0)) +&& ModelFilter[Page](_.parentId === -1)).fn) + if (result.isEmpty) { + (project.pages.find(ModelFilter[Page](_.slug === parts(0)).fn), true) } else { (result, false) } @@ -91,9 +91,10 @@ class Pages @Inject()(forms: OreForms, var parentId = -1 if (parts.size == 2) { pageName = parts(1) - parentId = project.pages.find(equalsIgnoreCase(_.name, parts(0))).map(_.id.getOrElse(-1)).getOrElse(-1) + parentId = project.pages.find(equalsIgnoreCase(_.slug, parts(0))).map(_.id.getOrElse(-1)).getOrElse(-1) } - val pageModel = project.getOrCreatePage(pageName, parentId) + val optionPage = project.pages.find(equalsIgnoreCase(_.slug, pageName)) + val pageModel = optionPage.getOrElse(project.getOrCreatePage(pageName, parentId)) Ok(views.view(project, pageModel, editorOpen = true)) } @@ -130,10 +131,10 @@ class Pages @Inject()(forms: OreForms, Redirect(self.show(author, slug, page)).withError("error.minLength") } else { val parts = page.split("/") - var pageName = parts(0) + var pageName = pageData.name.getOrElse(parts(0)) if (parts.size == 2) { - pageName = parts(1) - parentId = project.pages.find(equalsIgnoreCase(_.name, parts(0))).map(_.id.getOrElse(-1)).getOrElse(-1) + pageName = pageData.name.getOrElse(parts(1)) + parentId = project.pages.find(equalsIgnoreCase(_.slug, parts(0))).map(_.id.getOrElse(-1)).getOrElse(-1) } val pageModel = project.getOrCreatePage(pageName, parentId) pageData.content.map(pageModel.contents = _) diff --git a/app/form/OreForms.scala b/app/form/OreForms.scala index da1c6369b..9d2dec28e 100755 --- a/app/form/OreForms.scala +++ b/app/form/OreForms.scala @@ -168,6 +168,7 @@ class OreForms @Inject()(implicit config: OreConfig, factory: ProjectFactory, se */ lazy val PageEdit = Form(mapping( "parent-id" -> optional(number), + "name" -> optional(text), "content" -> optional(text( maxLength = MaxLength )))(PageSaveForm.apply)(PageSaveForm.unapply)) diff --git a/app/form/project/PageSaveForm.scala b/app/form/project/PageSaveForm.scala index 31487684f..30794769f 100644 --- a/app/form/project/PageSaveForm.scala +++ b/app/form/project/PageSaveForm.scala @@ -1,3 +1,3 @@ package form.project -case class PageSaveForm(parentId: Option[Int], content: Option[String]) +case class PageSaveForm(parentId: Option[Int], name: Option[String], content: Option[String]) diff --git a/app/models/project/Page.scala b/app/models/project/Page.scala index 4c56c682c..d6becdcc1 100644 --- a/app/models/project/Page.scala +++ b/app/models/project/Page.scala @@ -128,7 +128,7 @@ case class Page(override val id: Option[Int] = None, * * @return String */ - def fullSlug: String = if (parentPage.isDefined) { s"${parentPage.get.name}/${slug}" } else { slug } + def fullSlug: String = if (parentPage.isDefined) { s"${parentPage.get.slug}/${slug}" } else { slug } /** * Returns access to this Page's children (if any). diff --git a/app/views/projects/pages/modalPageCreate.scala.html b/app/views/projects/pages/modalPageCreate.scala.html index a76e892d3..01ce75374 100644 --- a/app/views/projects/pages/modalPageCreate.scala.html +++ b/app/views/projects/pages/modalPageCreate.scala.html @@ -44,7 +44,7 @@

    @messages("project.page.parent")

    diff --git a/app/views/projects/pages/view.scala.html b/app/views/projects/pages/view.scala.html index 89c1b13b6..3299f0764 100755 --- a/app/views/projects/pages/view.scala.html +++ b/app/views/projects/pages/view.scala.html @@ -42,13 +42,14 @@
    @utils.alert("error") @utils.editor( - saveCall = routes.Pages.save(model.ownerName, model.slug, page.name), - deleteCall = routes.Pages.delete(model.ownerName, model.slug, page.name), + saveCall = routes.Pages.save(model.ownerName, model.slug, page.fullSlug), + deleteCall = routes.Pages.delete(model.ownerName, model.slug, page.fullSlug), deletable = !page.isHome, enabled = canEditPages, raw = page.contents, cooked = page.html, - subject = "Page") + subject = "Page", + extraFormValue = page.name)
    @@ -107,7 +108,7 @@

    @messages("page.plural")

    @pg.children.sorted(_.name).map { child =>
  • - + @child.name
    • diff --git a/app/views/utils/editor.scala.html b/app/views/utils/editor.scala.html index 74cee99be..7ce7ad5da 100644 --- a/app/views/utils/editor.scala.html +++ b/app/views/utils/editor.scala.html @@ -9,7 +9,8 @@ cooked: Html = Html(""), subject: String = null, cancellable: Boolean = true, - targetForm: String = null)(implicit messages: Messages, request: Request[_]) + targetForm: String = null, + extraFormValue: String = null)(implicit messages: Messages, request: Request[_]) @if(enabled) { @@ -91,6 +92,9 @@

    Delete @subject.toLowerCase

    @if(savable) { @form(action = saveCall, 'id -> "form-editor-save") { @CSRF.formField + @if(extraFormValue != null) { + + } } } diff --git a/public/javascripts/main.js b/public/javascripts/main.js index f5cc08e8a..35c912344 100755 --- a/public/javascripts/main.js +++ b/public/javascripts/main.js @@ -75,6 +75,10 @@ function initTooltips() { }); } +function slugify(name) { + return name.trim().replace(/ +/g, ' ').replace(/ /g, '-'); +} + /* * ================================================== * = Google Analytics = diff --git a/public/javascripts/pageEdit.js b/public/javascripts/pageEdit.js index b23f0ed0a..bcbed5ece 100644 --- a/public/javascripts/pageEdit.js +++ b/public/javascripts/pageEdit.js @@ -44,18 +44,18 @@ $(function() { $('#continue-page').click(function() { var pageName = $('#page-name').val(); - var url = '/' + PROJECT_OWNER + '/' + PROJECT_SLUG + '/pages/' + pageName + '/edit'; + var url = '/' + PROJECT_OWNER + '/' + PROJECT_SLUG + '/pages/' + slugify(pageName) + '/edit'; var parent = $('.select-parent').find(':selected'); var parentId = -1; if (parent.length) { parentId = parent.val(); if (parentId != -1) - url = '/' + PROJECT_OWNER + '/' + PROJECT_SLUG + '/pages/' + parent.text() + '/' + pageName + '/edit'; + url = '/' + PROJECT_OWNER + '/' + PROJECT_SLUG + '/pages/' + parent.data('slug') + '/' + slugify(pageName) + '/edit'; } $.ajax({ method: 'post', url: url, - data: {csrfToken: csrf, 'parent-id': parentId, 'content': '# ' + pageName + '\n'}, + data: {csrfToken: csrf, 'parent-id': parentId, 'content': '# ' + pageName + '\n', 'name': pageName}, success: function() { go(url); }, From 98ade7150fb1a377f4c074fe598f21d51caad0ba Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Tue, 27 Feb 2018 22:31:42 +0100 Subject: [PATCH 69/77] Fix #456 --- app/views/projects/log.scala.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/projects/log.scala.html b/app/views/projects/log.scala.html index 99311db6e..b06e71106 100644 --- a/app/views/projects/log.scala.html +++ b/app/views/projects/log.scala.html @@ -32,7 +32,7 @@

    @messages("project.log.visibility.title")

    State Time Comment - Resolved by + Set by @@ -44,8 +44,8 @@

    @messages("project.log.visibility.title")

    @VisibilityTypes.withId(entry.visibility) @prettifyDateAndTime(entry.createdAt.getOrElse(Timestamp.from(Instant.now()))) @entry.renderComment() - @if(entry.resolvedBy.isDefined) { - @users.get(entry.resolvedBy.get).map(_.username).getOrElse("Unknown") + @if(entry.createdBy.isDefined) { + @users.get(entry.createdBy.get).map(_.username).getOrElse("Unknown") } else { Unknown } From 204db600d997d8ec19eed0cf976e2ee750de7c58 Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Wed, 28 Feb 2018 11:55:58 +0100 Subject: [PATCH 70/77] Redirect to project when state changes on user action --- app/controllers/project/Projects.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/project/Projects.scala b/app/controllers/project/Projects.scala index a3ffb3502..095878ad6 100755 --- a/app/controllers/project/Projects.scala +++ b/app/controllers/project/Projects.scala @@ -528,7 +528,7 @@ class Projects @Inject()(stats: StatTracker, if (project.visibility == VisibilityTypes.New) { project.setVisibility(VisibilityTypes.Public, "", request.user) } - Redirect(ShowHome) + Redirect(self.show(project.ownerName, project.slug)) } /** @@ -542,7 +542,7 @@ class Projects @Inject()(stats: StatTracker, if (project.visibility == VisibilityTypes.NeedsChanges) { project.setVisibility(VisibilityTypes.NeedsApproval, "", request.user) } - Redirect(ShowHome) + Redirect(self.show(project.ownerName, project.slug)) } def showLog(author: String, slug: String) = { From 3b5b2842ce99706935b7e4959490544838e38d87 Mon Sep 17 00:00:00 2001 From: Zach Date: Wed, 28 Feb 2018 11:24:34 -0500 Subject: [PATCH 71/77] Bump version for release --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 39a039e5c..983a27875 100755 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ name := "ore" -version := "1.5.6" +version := "1.5.7" lazy val `ore` = (project in file(".")).enablePlugins(PlayScala) From 3355dbdf6944c6f7c2230d7df48dfebff75dd072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Kleinekath=C3=B6fer?= Date: Wed, 28 Feb 2018 17:40:29 +0100 Subject: [PATCH 72/77] Trim page name and bump version --- build.sbt | 2 +- public/javascripts/pageEdit.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 983a27875..f7284d360 100755 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ name := "ore" -version := "1.5.7" +version := "1.5.8" lazy val `ore` = (project in file(".")).enablePlugins(PlayScala) diff --git a/public/javascripts/pageEdit.js b/public/javascripts/pageEdit.js index bcbed5ece..c89bf4b18 100644 --- a/public/javascripts/pageEdit.js +++ b/public/javascripts/pageEdit.js @@ -43,7 +43,7 @@ $(function() { }); $('#continue-page').click(function() { - var pageName = $('#page-name').val(); + var pageName = $('#page-name').val().trim(); var url = '/' + PROJECT_OWNER + '/' + PROJECT_SLUG + '/pages/' + slugify(pageName) + '/edit'; var parent = $('.select-parent').find(':selected'); var parentId = -1; From 7fc2e51e41e578404fe1690e3289f36c61077f64 Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Thu, 1 Mar 2018 12:58:35 +0100 Subject: [PATCH 73/77] Improve user stars navigation --- app/views/users/projects.scala.html | 3 +-- public/javascripts/userPage.js | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/views/users/projects.scala.html b/app/views/users/projects.scala.html index 1f024254e..6f482370a 100755 --- a/app/views/users/projects.scala.html +++ b/app/views/users/projects.scala.html @@ -42,7 +42,7 @@

    @messages("project.starred")<
    @star.recommendedVersion.versionString @defining(star.category) { category => - + }
    @@ -54,7 +54,6 @@

    @messages("project.starred")<
    - @messages("user.seeAll")
    diff --git a/public/javascripts/userPage.js b/public/javascripts/userPage.js index cc2b9001f..94d0bf41b 100644 --- a/public/javascripts/userPage.js +++ b/public/javascripts/userPage.js @@ -74,8 +74,8 @@ function loadStars(increment) { + '' + '' + projectData.owner + '/' + slug + '' + '
    ' - + '' + projectData.recommended.version + ' ' - + '' + + '' + projectData.recommended.name + ' ' + + '' + '
    ' + ''; From b32c9910c6a2246a79ea443fd0e76308c7a847e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Kleinekath=C3=B6fer?= Date: Thu, 1 Mar 2018 19:08:30 +0100 Subject: [PATCH 74/77] Updated dependencies --- build.sbt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index f7284d360..1126d3f65 100755 --- a/build.sbt +++ b/build.sbt @@ -24,12 +24,12 @@ libraryDependencies ++= Seq( "org.spongepowered" % "plugin-meta" % "0.4.1", "com.typesafe.play" %% "play-slick" % "2.1.0", "com.typesafe.play" %% "play-slick-evolutions" % "2.1.0", - "org.postgresql" % "postgresql" % "9.4.1212.jre7", + "org.postgresql" % "postgresql" % "42.2.1", "com.github.tminglei" %% "slick-pg" % "0.15.5", - "com.getsentry.raven" % "raven-logback" % "7.2.2", - "org.bouncycastle" % "bcprov-jdk15on" % "1.56", - "org.bouncycastle" % "bcpkix-jdk15on" % "1.56", - "org.bouncycastle" % "bcpg-jdk15on" % "1.56", + "com.getsentry.raven" % "raven-logback" % "8.0.3", + "org.bouncycastle" % "bcprov-jdk15on" % "1.59", + "org.bouncycastle" % "bcpkix-jdk15on" % "1.59", + "org.bouncycastle" % "bcpg-jdk15on" % "1.59", "javax.mail" % "mail" % "1.4.7", "com.vladsch.flexmark" % "flexmark" % "0.32.4", @@ -41,8 +41,8 @@ libraryDependencies ++= Seq( "com.vladsch.flexmark" % "flexmark-ext-typographic" % "0.32.4", "com.vladsch.flexmark" % "flexmark-ext-wikilink" % "0.32.4", - "org.webjars" % "jquery" % "2.2.4", + "org.webjars" % "jquery" % "3.3.1", "org.webjars" % "font-awesome" % "4.7.0", - "org.webjars.bower" % "filesize" % "3.2.1", + "org.webjars.bower" % "filesize" % "3.5.6", "org.webjars.bower" % "momentjs" % "2.20.1" ) From 796d44b6708216c1cafbc8afe26e78399023759e Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Thu, 1 Mar 2018 19:36:57 +0100 Subject: [PATCH 75/77] Revert jquery version --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 1126d3f65..ed2cbaea3 100755 --- a/build.sbt +++ b/build.sbt @@ -41,7 +41,7 @@ libraryDependencies ++= Seq( "com.vladsch.flexmark" % "flexmark-ext-typographic" % "0.32.4", "com.vladsch.flexmark" % "flexmark-ext-wikilink" % "0.32.4", - "org.webjars" % "jquery" % "3.3.1", + "org.webjars" % "jquery" % "2.2.4", "org.webjars" % "font-awesome" % "4.7.0", "org.webjars.bower" % "filesize" % "3.5.6", "org.webjars.bower" % "momentjs" % "2.20.1" From 52f3f3d4503d4e0ec5cbc10db773101d006c9268 Mon Sep 17 00:00:00 2001 From: Ewout Van Schil Date: Thu, 1 Mar 2018 11:21:37 +0100 Subject: [PATCH 76/77] Use non breaking space so safari renders it correct --- app/views/users/view.scala.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/view.scala.html b/app/views/users/view.scala.html index 3119d8ac0..5c6a77642 100644 --- a/app/views/users/view.scala.html +++ b/app/views/users/view.scala.html @@ -165,7 +165,7 @@