Skip to content
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

Jump to bottom

Scala 2.13: Fix ReverseRouting exhaustive match compilation error #25360

Merged
merged 1 commit into from
Aug 10, 2022
Merged

Scala 2.13: Fix ReverseRouting exhaustive match compilation error #25360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion applications/app/controllers/AtomPageController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,15 @@ class AtomPageController(
)
}

def renderNoJs(atomType: String, id: String): Action[AnyContent] = render(atomType, id, false, false)

def renderNoJsVerticalScroll(atomType: String, id: String): Action[AnyContent] = render(atomType, id, false, true)

def render(
atomType: String,
id: String,
isJsEnabled: Boolean,
hasVerticalScrollbar: Boolean,
inApp: Boolean,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This parameter was introduced in November 2017 with #18213, and became obsolete in October 2019 with #21897.

): Action[AnyContent] =
Action.async { implicit request =>
lookup(s"atom/$atomType/$id") map {
Expand Down
7 changes: 3 additions & 4 deletions applications/conf/routes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,9 @@ GET /index/contributors
GET /index/contributors/*contributor controllers.TagIndexController.contributor(contributor)

GET /embed/video/*path controllers.EmbedController.render(path)
GET /embed/atom/:atomType/:id controllers.AtomPageController.render(atomType: String, id: String, isJsEnabled: Boolean = true, hasVerticalScrollbar: Boolean = false, inApp: Boolean = false)
GET /embed/atom/:atomType/:id/nojs controllers.AtomPageController.render(atomType: String, id: String, isJsEnabled: Boolean = false, hasVerticalScrollbar: Boolean = false, inApp: Boolean = false)
GET /embed/atom/:atomType/:id/nojs/scroll-y controllers.AtomPageController.render(atomType: String, id: String, isJsEnabled: Boolean = false, hasVerticalScrollbar: Boolean = true, inApp: Boolean = false)
GET /embed/atom/:atomType/:id/inapp controllers.AtomPageController.render(atomType: String, id: String, isJsEnabled: Boolean = true, hasVerticalScrollbar: Boolean = true, inApp: Boolean = true)
GET /embed/atom/:atomType/:id controllers.AtomPageController.render(atomType: String, id: String, isJsEnabled: Boolean = true, hasVerticalScrollbar: Boolean = false)
GET /embed/atom/:atomType/:id/nojs controllers.AtomPageController.renderNoJs(atomType: String, id: String)
GET /embed/atom/:atomType/:id/nojs/scroll-y controllers.AtomPageController.renderNoJsVerticalScroll(atomType: String, id: String)
POST /story-questions/answers/signup controllers.AtomPageController.signup()
OPTIONS /story-questions/answers/signup controllers.AtomPageController.options()

Expand Down
3 changes: 3 additions & 0 deletions identity/app/controllers/FormstackController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ class FormstackController(

val page = IdentityPage("/form", "Form")

def formstackFormEmbed(formReference: String): Action[AnyContent] =
formstackForm(formReference, true)

def formstackForm(formReference: String, composer: Boolean): Action[AnyContent] =
fullAuthAction.async { implicit request =>
if (Switches.IdentityFormstackSwitch.isSwitchedOn) {
Expand Down
2 changes: 1 addition & 1 deletion identity/conf/routes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ GET /user/:vanityUrl/:activityType controllers.PublicProfileCon
########################################################################################################################
GET /form/complete controllers.FormstackController.complete
GET /form/:formReference controllers.FormstackController.formstackForm(formReference: String, composer: Boolean = false)
GET /form/embed/:formReference controllers.FormstackController.formstackForm(formReference: String, composer: Boolean = true)
GET /form/embed/:formReference controllers.FormstackController.formstackFormEmbed(formReference: String)

########################################################################################################################
# Account deletion
Expand Down