From bc05ddc0ebd6fdc826ef2beec99304bac60ddd8a Mon Sep 17 00:00:00 2001
From: Andrew Bezold <andrew.bezold@gmail.com>
Date: Sun, 24 Jan 2021 10:23:05 -0500
Subject: Redirect on changed user and org name (#11649)

* Add redirect for user

* Add redirect for orgs

* Add user redirect test

* Appease linter

* Add comment to DeleteUserRedirect function

* Fix locale changes

* Fix GetUserByParams

* Fix orgAssignment

* Remove debug logging

* Add redirect prompt

* Dont Export DeleteUserRedirect & only use it within a session

* Unexport newUserRedirect

* cleanup

* Fix & Dedub API code

* Format Template

* Add Migration & rm dublicat

* Refactor: unexport newRepoRedirect() & rm dedub del exec

* if this fails we'll need to re-rename the user directory

Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
---
 templates/org/settings/options.tmpl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'templates/org')

diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl
index 348f8cb533..09bf5e0caa 100644
--- a/templates/org/settings/options.tmpl
+++ b/templates/org/settings/options.tmpl
@@ -13,7 +13,10 @@
 					<form class="ui form" action="{{.Link}}" method="post">
 						{{.CsrfTokenHtml}}
 						<div class="required field {{if .Err_Name}}error{{end}}">
-							<label for="org_name">{{.i18n.Tr "org.org_name_holder"}}<span class="text red hide" id="org-name-change-prompt"> {{.i18n.Tr "org.settings.change_orgname_prompt"}}</span></label>
+							<label for="org_name">{{.i18n.Tr "org.org_name_holder"}}
+								<span class="text red hide" id="org-name-change-prompt"> {{.i18n.Tr "org.settings.change_orgname_prompt"}}</span>
+								<span class="text red hide" id="org-name-change-redirect-prompt"> {{.i18n.Tr "org.settings.change_orgname_redirect_prompt"}}</span>
+							</label>
 							<input id="org_name" name="name" value="{{.Org.Name}}" data-org-name="{{.Org.Name}}" autofocus required>
 						</div>
 						<div class="field {{if .Err_FullName}}error{{end}}">
-- 
cgit v1.2.3