Gleipnir/nidus-sync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make arcgis configuration page render again.

Browse source
This commit is contained in:
Eli Ribble 2026-03-06 22:20:26 +00:00
parent e57d2e73a9
commit 228379a8a6
No known key found for this signature in database
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
html/template/sync/configuration/integration-arcgis.html
View file

@ -33,7 +33,7 @@
<input
type="text"
class="form-control"
value="{{ .Organization.ArcgisID.GetOr "" }}"
value="{{ .C.ArcGISAccount.ID }}"
readonly
/>
</div>
@ -45,7 +45,7 @@
<input
type="text"
class="form-control"
value="{{ .Organization.ArcgisName.GetOr "" }}"
value="{{ .C.ArcGISAccount.Name }}"
readonly
/>
</div>

13
sync/configuration.go
View file

@ -23,7 +23,8 @@ type contentSettingOrganization struct {
}
type contentSettingIntegration struct {
ArcGISOAuth *models.ArcgisOauthToken
ArcGISAccount *models.ArcgisAccount
ArcGISOAuth *models.ArcgisOauthToken
}
func getConfigurationOrganization(ctx context.Context, r *http.Request, org *models.Organization, u *models.User) (*html.Response[contentSettingOrganization], *nhttp.ErrorWithStatus) {
@ -82,8 +83,16 @@ func getConfigurationIntegrationArcgis(ctx context.Context, r *http.Request, org
if err != nil {
return nil, nhttp.NewError("Failed to get oauth: %w", err)
}
var account *models.ArcgisAccount
if org.ArcgisAccountID.IsValue() {
account, err = models.FindArcgisAccount(ctx, db.PGInstance.BobDB, org.ArcgisAccountID.MustGet())
if err != nil {
return nil, nhttp.NewError("Failed to get arcgis: %w", err)
}
}
data := contentSettingIntegration{
ArcGISOAuth: oauth,
ArcGISAccount: account,
ArcGISOAuth: oauth,
}
return html.NewResponse("sync/configuration/integration-arcgis.html", data), nil
}