From daca907ab688dd7bf8fa217a747f16ca94f487e8 Mon Sep 17 00:00:00 2001 From: NorthRealm <155140859+NorthRealm@users.noreply.github.com> Date: Fri, 2 May 2025 23:33:35 +0800 Subject: [PATCH 01/10] update --- options/locale/locale_en-US.ini | 3 +++ routers/web/shared/secrets/secrets.go | 9 +++++++-- templates/shared/secrets/add_list.tmpl | 11 +++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index a8fabc9ca1014..f030a62334a39 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3733,6 +3733,9 @@ deletion = Remove secret deletion.description = Removing a secret is permanent and cannot be undone. Continue? deletion.success = The secret has been removed. deletion.failed = Failed to remove secret. +edit = Edit secret +edit.success = The secret has been updated. +edit.failed = Failed to update secret. management = Secrets Management [actions] diff --git a/routers/web/shared/secrets/secrets.go b/routers/web/shared/secrets/secrets.go index c8b80ebb2638c..c23114c9ac931 100644 --- a/routers/web/shared/secrets/secrets.go +++ b/routers/web/shared/secrets/secrets.go @@ -29,14 +29,19 @@ func SetSecretsContext(ctx *context.Context, ownerID, repoID int64) { func PerformSecretsPost(ctx *context.Context, ownerID, repoID int64, redirectURL string) { form := web.GetForm(ctx).(*forms.AddSecretForm) - s, _, err := secret_service.CreateOrUpdateSecret(ctx, ownerID, repoID, form.Name, util.ReserveLineBreakForTextarea(form.Data), form.Description) + s, created, err := secret_service.CreateOrUpdateSecret(ctx, ownerID, repoID, form.Name, util.ReserveLineBreakForTextarea(form.Data), form.Description) if err != nil { log.Error("CreateOrUpdateSecret failed: %v", err) + // TODO: secrets.creation.failed and secrets.edit.failed? ctx.JSONError(ctx.Tr("secrets.creation.failed")) return } - ctx.Flash.Success(ctx.Tr("secrets.creation.success", s.Name)) + if created { + ctx.Flash.Success(ctx.Tr("secrets.creation.success", s.Name)) + } else { + ctx.Flash.Success(ctx.Tr("secrets.edit.success", s.Name)) + } ctx.JSONRedirect(redirectURL) } diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl index 977f308b71ea3..96c5fbae72a5d 100644 --- a/templates/shared/secrets/add_list.tmpl +++ b/templates/shared/secrets/add_list.tmpl @@ -33,6 +33,17 @@ {{ctx.Locale.Tr "settings.added_on" (DateUtils.AbsoluteShort .CreatedUnix)}} + From 913235061f9d01df253b6d0c88759f6d450c509c Mon Sep 17 00:00:00 2001 From: NorthRealm <155140859+NorthRealm@users.noreply.github.com> Date: Sat, 3 May 2025 01:21:43 +0800 Subject: [PATCH 03/10] fix --- templates/shared/secrets/add_list.tmpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl index ed3f41e39a505..665344178d3ed 100644 --- a/templates/shared/secrets/add_list.tmpl +++ b/templates/shared/secrets/add_list.tmpl @@ -7,6 +7,7 @@ data-modal-header="{{ctx.Locale.Tr "secrets.creation"}}" data-modal-secret-name.value="" data-modal-secret-name.disabled="" + data-modal-secret-data="" data-modal-secret-description="" > {{ctx.Locale.Tr "secrets.creation"}} @@ -43,6 +44,7 @@ data-tooltip-content="{{ctx.Locale.Tr "secrets.edit"}}" data-modal-secret-name.value="{{.Name}}" data-modal-secret-name.disabled="true" + data-modal-secret-data="" data-modal-secret-description="{{if .Description}}{{.Description}}{{end}}" > {{svg "octicon-pencil"}} From d27757b9aa7617eea30ed8fe8513eabb01db2f29 Mon Sep 17 00:00:00 2001 From: NorthRealm <155140859+NorthRealm@users.noreply.github.com> Date: Sat, 3 May 2025 02:16:09 +0800 Subject: [PATCH 04/10] revert --- options/locale/locale_en-US.ini | 2 -- routers/web/shared/secrets/secrets.go | 9 ++------- templates/shared/secrets/add_list.tmpl | 4 +--- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index f030a62334a39..66e36e9b7c00b 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3734,8 +3734,6 @@ deletion.description = Removing a secret is permanent and cannot be undone. Cont deletion.success = The secret has been removed. deletion.failed = Failed to remove secret. edit = Edit secret -edit.success = The secret has been updated. -edit.failed = Failed to update secret. management = Secrets Management [actions] diff --git a/routers/web/shared/secrets/secrets.go b/routers/web/shared/secrets/secrets.go index c23114c9ac931..c8b80ebb2638c 100644 --- a/routers/web/shared/secrets/secrets.go +++ b/routers/web/shared/secrets/secrets.go @@ -29,19 +29,14 @@ func SetSecretsContext(ctx *context.Context, ownerID, repoID int64) { func PerformSecretsPost(ctx *context.Context, ownerID, repoID int64, redirectURL string) { form := web.GetForm(ctx).(*forms.AddSecretForm) - s, created, err := secret_service.CreateOrUpdateSecret(ctx, ownerID, repoID, form.Name, util.ReserveLineBreakForTextarea(form.Data), form.Description) + s, _, err := secret_service.CreateOrUpdateSecret(ctx, ownerID, repoID, form.Name, util.ReserveLineBreakForTextarea(form.Data), form.Description) if err != nil { log.Error("CreateOrUpdateSecret failed: %v", err) - // TODO: secrets.creation.failed and secrets.edit.failed? ctx.JSONError(ctx.Tr("secrets.creation.failed")) return } - if created { - ctx.Flash.Success(ctx.Tr("secrets.creation.success", s.Name)) - } else { - ctx.Flash.Success(ctx.Tr("secrets.edit.success", s.Name)) - } + ctx.Flash.Success(ctx.Tr("secrets.creation.success", s.Name)) ctx.JSONRedirect(redirectURL) } diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl index 665344178d3ed..c58cbfcd38582 100644 --- a/templates/shared/secrets/add_list.tmpl +++ b/templates/shared/secrets/add_list.tmpl @@ -6,7 +6,6 @@ data-modal-form.action="{{.Link}}" data-modal-header="{{ctx.Locale.Tr "secrets.creation"}}" data-modal-secret-name.value="" - data-modal-secret-name.disabled="" data-modal-secret-data="" data-modal-secret-description="" > @@ -40,10 +39,9 @@ @@ -40,8 +40,8 @@