SQL fix and addressing feedback from demo #5275
Conversation
chenriksson
requested review from
joelverhagen,
agr,
loic-sharma,
xavierdecoster,
shishirx34,
ryuyu,
cristinamanum,
skofman1 and
scottbommarito
| @@ -62,10 +62,11 @@ public partial class AuthenticationController | |||
| /// Sign In\Register view | |||
| /// </summary> | |||
| [HttpGet] | |||
| public virtual ActionResult LogOn(string returnUrl) | |||
| public virtual ActionResult LogOn(string returnUrl, string returnUrlMessage = "") | |||
There was a problem hiding this comment.
Just realized I'm putting this in url; and should probably move to a header. Will update in a few minutes...
| @@ -62,10 +62,11 @@ public partial class AuthenticationController | |||
| /// Sign In\Register view | |||
| /// </summary> | |||
| [HttpGet] | |||
| public virtual ActionResult LogOn(string returnUrl) | |||
| public virtual ActionResult LogOn(string returnUrl, string returnUrlMessage = "") | |||
There was a problem hiding this comment.
Why not TempData? Seems a bit weird to encode an entire message in the URL.
There was a problem hiding this comment.
Actually, in light of returnUrl it kind of makes sense... I'm torn 😄
There was a problem hiding this comment.
Agree it should not have been in URL. Fixed by moving to TempData.
| </div> | ||
| } | ||
| <div> | ||
| @TempData["TransformError"] |
There was a problem hiding this comment.
Why is this TempData and not part of a view model?
There was a problem hiding this comment.
Laziness... fixed by creating strong type viewModel for error message.
chenriksson
force-pushed
the
chenriks-org-migrationfix
branch
from
9af0f71
to
75b39b7
Compare
|
@joelverhagen Addressed feedback. Also, reminder to review the screenshots... in case you haven't. |
chenriksson
force-pushed
the
chenriks-org-migrationfix
branch
from
670b44c
to
8fa3f13
Compare
| @@ -153,9 +151,14 @@ public virtual ActionResult TransformToOrganization() | |||
|
|
|||
| await _userService.RequestTransformToOrganizationAccount(accountToTransform, adminUser); | |||
|
|
|||
| // prompt for admin sign-on to confirm transformation | |||
|
|
|||
There was a problem hiding this comment.
nit: 2 lines whitespace here instead of one?
src/NuGetGallery/Strings.resx
Outdated
| @@ -734,6 +734,9 @@ For more information, please contact '{2}'.</value> | |||
| <value>Administrator account '{0}' has not confirmed their email address.</value> | |||
| </data> | |||
| <data name="TransformAccount_RequestExists" xml:space="preserve"> | |||
| <value>Another tranform request was created on {0} with organization admin '{1}'.</value> | |||
| <value>Another tranform request was created on {0} for administrator '{1}'. Note that a new request will overwrite this.</value> | |||
Includes the following, with screenshots:
Update SQL to return and not migrate when no request match
Add informational hint on transform page to indicate what is expected for administrator:
//cc @anangaur , @karann-msft