Skip to content
This repository has been archived by the owner on Apr 20, 2024. It is now read-only.

Commit

Permalink
Merge pull request #119 from nodes-vapor/feature/forms-0-7
Browse files Browse the repository at this point in the history
Update to Forms 0.7
  • Loading branch information
steffendsommer authored Aug 21, 2018
2 parents 9b26aa2 + db9126e commit ae7a9ce
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ let package = Package(
dependencies: [
.package(url: "https://github.com/harlanhaskins/Punctual.swift.git", .upToNextMajor(from: "1.0.0")),
.package(url: "https://github.com/nodes-vapor/flash.git", .upToNextMajor(from: "1.0.0")),
.package(url: "https://github.com/nodes-vapor/forms.git", .upToNextMinor(from: "0.6.1")),
.package(url: "https://github.com/nodes-vapor/forms.git", .upToNextMinor(from: "0.7.0")),
.package(url: "https://github.com/nodes-vapor/sugar.git", .upToNextMajor(from: "2.0.0")),
.package(url: "https://github.com/vapor/fluent-provider.git", .upToNextMajor(from: "1.0.0")),
.package(url: "https://github.com/vapor/jwt-provider.git", .upToNextMajor(from: "1.0.0")),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ open class FrontendUserControllerDelegate<U: PasswordResettableUser>:
viewRenderer: ViewRenderer
) throws -> ResponseRepresentable {
let fieldset = try request.fieldset ??
U.extractPasswordResetInfo(from: request)
.makeFieldset(inValidationMode: .none)
U.extractPasswordResetInfo(from: request).makeFieldset(inValidationMode: .none)

return try viewRenderer.make(
pathToFormView,
Expand All @@ -79,8 +78,7 @@ open class FrontendUserControllerDelegate<U: PasswordResettableUser>:
let passwordResetInfo = try U.extractPasswordResetInfo(from: request)

// prepare common response
let fieldset = try passwordResetInfo
.makeFieldset(inValidationMode: .all)
let fieldset = try passwordResetInfo.makeFieldset(inValidationMode: .all)
let redirectToForm = Response(redirect: formPath).setFieldset(fieldset)

// ensure form values are valid
Expand Down

0 comments on commit ae7a9ce

Please sign in to comment.