Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]
## Unreleased

### Fixed
- Fixed `NoSuchElementException` in spaces listing page when user is not defined. The error occurred when calling `user.get.id` on an undefined user in the spaces ownership dropdown. Added proper user existence checks in `listSpaces.scala.html` and `miniList.scala.html` templates.
- Removed refrences to repo.typesafe.com from sbt-launch.jar and build.scala

### Removed
Expand Down
16 changes: 9 additions & 7 deletions app/views/spaces/listSpaces.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,15 @@ <h1>@title</h1>
case (_, _) => {}
}
}
<div class="btn-group btn-group-sm" id="spacesOwnership-displayed-dropdown">
<select id="spacesOwnership" class="form-control" onchange="getSpaceType('@user.get.id')">
<option value="1">Joined Spaces</option>
<option value="2">My Spaces</option>
<option value="3">All Spaces</option>
</select>
</div>
@if(user.isDefined) {
<div class="btn-group btn-group-sm" id="spacesOwnership-displayed-dropdown">
<select id="spacesOwnership" class="form-control" onchange="getSpaceType('@user.get.id')">
<option value="1">Joined Spaces</option>
<option value="2">My Spaces</option>
<option value="3">All Spaces</option>
</select>
</div>
}
<div class="btn-group btn-group-sm" id="number-displayed-dropdown">
<select id="numPageItems" class="form-control" onchange="getValue()">
<option value="12">12</option>
Expand Down
2 changes: 1 addition & 1 deletion app/views/spaces/miniList.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<div class="text-center">
@if(ownProfile) {
<div>@Messages("home.empty.message", Messages("spaces.title").toLowerCase)</div>
@if(user.get.status != UserStatus.ReadOnly) {
@if(user.isDefined && user.get.status != UserStatus.ReadOnly) {
<div><a class="btn-link" href="@routes.Spaces.newSpace()" title="Create a new @Messages("space.title")">@Messages("create.title", Messages("space.title"))</a></div>
}
} else {
Expand Down
Loading