Skip to content

when space is created, add the creator to space as admin #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lmarini merged 4 commits into from
Mar 1, 2021
Merged

when space is created, add the creator to space as admin #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5189d23
when space is created, add the creator to space as admin
tcnichol Feb 25, 2021
18669c3
changelog
tcnichol Feb 25, 2021
167008c
adding issue and issue # to CHANGELOG.md
tcnichol Feb 25, 2021
8a71330
Merge branch 'develop' into api-create-spaces-not-visible
lmarini Mar 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

### Fixed
- Clowder will no longer offer a Download button for a file until it has been PROCESSED.
- When space created through api the creator was not added to space as admin [#179](https://github.com/clowder-framework/clowder/issues/179).

### Changed
- `/api/me` will now return some of the same information as response headers.
Expand Down
24 changes: 13 additions & 11 deletions app/api/Spaces.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
package api

import java.util.Date
import javax.inject.Inject
import api.Permission.Permission
import controllers.Utils
import models._
import play.api.Logger
import controllers.Utils
import play.api.Play._
import play.api.libs.json.Json
import play.api.libs.json.Json._
import play.api.libs.json.Json.toJson
import play.api.i18n.Messages
import play.api.libs.json.{JsError, JsResult, JsSuccess, Json}
import play.api.libs.json.Json.{toJson, _}
import services._
import util.Mail
import play.api.libs.json.JsResult
import play.api.libs.json.JsSuccess
import play.api.libs.json.JsError
import play.api.i18n.Messages

import scala.util.Try
import java.util.Date
import javax.inject.Inject

/**
* Spaces allow users to partition the data into realms only accessible to users with the right permissions.
Expand Down Expand Up @@ -51,6 +46,13 @@ class Spaces @Inject()(spaces: SpaceService,
case Some(id) => {
appConfig.incrementCount('spaces, 1)
events.addObjectEvent(request.user, c.id, c.name, "create_space")
userService.findRoleByName("Admin") match {
case Some(realRole) => {
spaces.addUser(userId, realRole, UUID(id))
}
case None => Logger.info("No admin role found")

}
Ok(toJson(Map("id" -> id)))
}
case None => Ok(toJson(Map("status" -> "error")))
Expand Down