From f96838cf62515d1be2570f802c046279926faf95 Mon Sep 17 00:00:00 2001
From: Livio Amstutz <livio.a@gmail.com>
Date: Tue, 22 Dec 2020 12:12:05 +0100
Subject: [PATCH] fix: org name overwrite (#1133)

* fix: org name overwrite

* import
---
 .../ui/login/handler/register_org_handler.go  | 20 +++++++++----------
 .../login/static/templates/register_org.html  |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/internal/ui/login/handler/register_org_handler.go b/internal/ui/login/handler/register_org_handler.go
index c1a4b8dc6e..ea2f7a739d 100644
--- a/internal/ui/login/handler/register_org_handler.go
+++ b/internal/ui/login/handler/register_org_handler.go
@@ -1,9 +1,9 @@
 package handler
 
 import (
-	auth_model "github.com/caos/zitadel/internal/auth/model"
 	"net/http"
 
+	auth_model "github.com/caos/zitadel/internal/auth/model"
 	"github.com/caos/zitadel/internal/auth_request/model"
 	caos_errs "github.com/caos/zitadel/internal/errors"
 	org_model "github.com/caos/zitadel/internal/org/model"
@@ -15,14 +15,14 @@ const (
 )
 
 type registerOrgFormData struct {
-	OrgName      string `schema:"orgname"`
-	Email        string `schema:"email"`
-	Username     string `schema:"username"`
-	Firstname    string `schema:"firstname"`
-	Lastname     string `schema:"lastname"`
-	Password     string `schema:"register-password"`
-	Password2    string `schema:"register-password-confirmation"`
-	TermsConfirm bool   `schema:"terms-confirm"`
+	RegisterOrgName string `schema:"orgname"`
+	Email           string `schema:"email"`
+	Username        string `schema:"username"`
+	Firstname       string `schema:"firstname"`
+	Lastname        string `schema:"lastname"`
+	Password        string `schema:"register-password"`
+	Password2       string `schema:"register-password-confirmation"`
+	TermsConfirm    bool   `schema:"terms-confirm"`
 }
 
 type registerOrgData struct {
@@ -140,6 +140,6 @@ func (d registerOrgFormData) toUserModel() *usr_model.User {
 
 func (d registerOrgFormData) toOrgModel() *org_model.Org {
 	return &org_model.Org{
-		Name: d.OrgName,
+		Name: d.RegisterOrgName,
 	}
 }
diff --git a/internal/ui/login/static/templates/register_org.html b/internal/ui/login/static/templates/register_org.html
index fc0aeea156..ed8037bea1 100644
--- a/internal/ui/login/static/templates/register_org.html
+++ b/internal/ui/login/static/templates/register_org.html
@@ -15,7 +15,7 @@
     <div class="fields">
         <div class="field">
             <label class="label" for="orgname">{{t "RegistrationOrg.OrgName"}}</label>
-            <input class="input" type="text" id="orgname" name="orgname" value="{{ .OrgName }}" autofocus required>
+            <input class="input" type="text" id="orgname" name="orgname" value="{{ .RegisterOrgName }}" autofocus required>
         </div>
 
         {{if .UserLoginMustBeDomain}}