tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-11-04 05:18:25 +00:00
Code Releases Activity

Almost finished

Browse Source
This commit is contained in:
Lunny Xiao
2022-10-14 21:22:22 +08:00
committed by Jason Song
parent da60ae69be
commit 8ec691f3ce
6 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
options/locale/locale_en-US.ini
View File

@@ -2075,12 +2075,17 @@ settings.no_deploy_keys = There are no deploy keys yet.
settings.secrets = Secrets
settings.pull_request_read = Pull Request Read
settings.pull_request_read_info = "If allow pull request read the secret, it's security related."
settings.pull_request_read_hint = Allow pull request read the secret
settings.add_secret = Add Secret
settings.add_secret_success = The secret '%s' has been added.
settings.secret_value_content_placeholder = Input any content
settings.secret_desc = Secrets could be visited by repository events
settings.secret_content = Value
settings.secret_key = Key
settings.no_secret = There are no secrets yet.
settings.secret_deletion = Remove secret
settings.secret_deletion_desc = Removing a secret will revoke its access to this repository. Continue?
settings.secret_deletion_success = The secret has been removed.
settings.title = Title
settings.deploy_key_content = Content
settings.key_been_used = A deploy key with identical content is already in use.
@@ -2399,6 +2404,7 @@ settings.update_setting_success = Organization settings have been updated.
settings.change_orgname_prompt = Note: changing the organization name also changes the organization's URL.
settings.change_orgname_redirect_prompt = The old name will redirect until it is claimed.
settings.update_avatar_success = The organization's avatar has been updated.
settings.secrets = Secrets
settings.delete = Delete Organization
settings.delete_account = Delete This Organization
settings.delete_prompt = The organization will be permanently removed. This <strong>CANNOT</strong> be undone!

6
routers/web/org/setting.go
View File

@@ -279,16 +279,16 @@ func SecretsPost(ctx *context.Context) {
}
log.Trace("Secret added: %d", ctx.Org.Organization.ID)
ctx.Flash.Success(ctx.Tr("repo.settings.add_key_success", form.Title))
ctx.Flash.Success(ctx.Tr("repo.settings.add_secret_success", form.Title))
ctx.Redirect(ctx.Org.OrgLink + "/settings/secrets")
}
// SecretsDelete delete secrets
func SecretsDelete(ctx *context.Context) {
if err := secret_service.DeleteSecretByID(ctx, ctx.ParamsInt64("id")); err != nil {
if err := secret_service.DeleteSecretByID(ctx, ctx.FormInt64("id")); err != nil {
ctx.Flash.Error("DeleteSecretByID: " + err.Error())
} else {
ctx.Flash.Success(ctx.Tr("repo.settings.deploy_key_deletion_success"))
ctx.Flash.Success(ctx.Tr("repo.settings.secret_deletion_success"))
}
ctx.JSON(http.StatusOK, map[string]interface{}{

4
routers/web/repo/setting.go
View File

@@ -1133,7 +1133,7 @@ func SecretsPost(ctx *context.Context) {
}
log.Trace("Secret added: %d", ctx.Repo.Repository.ID)
ctx.Flash.Success(ctx.Tr("repo.settings.add_key_success", form.Title))
ctx.Flash.Success(ctx.Tr("repo.settings.add_secret_success", form.Title))
ctx.Redirect(ctx.Repo.RepoLink + "/settings/keys")
}
@@ -1208,7 +1208,7 @@ func DeleteSecret(ctx *context.Context) {
if err := secret_service.DeleteSecretByID(ctx, ctx.FormInt64("id")); err != nil {
ctx.Flash.Error("DeleteSecretByID: " + err.Error())
} else {
ctx.Flash.Success(ctx.Tr("repo.settings.deploy_key_deletion_success"))
ctx.Flash.Success(ctx.Tr("repo.settings.secret_deletion_success"))
}
ctx.JSON(http.StatusOK, map[string]interface{}{

2
templates/org/settings/navbar.tmpl
View File

@@ -26,7 +26,7 @@
{{.locale.Tr "repo.runners"}}
</a>
<a class="{{if .PageIsOrgSettingsSecrets}}active{{end}} item" href="{{.OrgLink}}/settings/secrets">
{{.locale.Tr "repo.secrets"}}
{{.locale.Tr "org.settings.secrets"}}
</a>
<a class="{{if .PageIsSettingsDelete}}active{{end}} item" href="{{.OrgLink}}/settings/delete">
{{.locale.Tr "org.settings.delete"}}

10
templates/org/settings/secrets.tmpl
View File

@@ -25,7 +25,7 @@
</div>
<div class="field {{if .Err_Content}}error{{end}}">
<label for="content">{{.locale.Tr "repo.settings.secret_content"}}</label>
<textarea id="ssh-key-content" name="content" placeholder="{{.locale.Tr "settings.secret_value_content_placeholder"}}" required>{{.content}}</textarea>
<textarea id="ssh-key-content" name="content" placeholder="{{.locale.Tr "repo.settings.secret_value_content_placeholder"}}" required>{{.content}}</textarea>
</div>
<div class="field">
<div class="ui checkbox {{if .Err_IsWritable}}error{{end}}">
@@ -65,8 +65,8 @@
<i>
{{$.locale.Tr "settings.add_on"}}
<span>{{.CreatedUnix.FormatShort}}</span>
— {{svg "octicon-info"}} -
<span>{{if .PullRequest}} {{$.locale.Tr "repo.settings.pull_request_read_info"}} {{end}}</span>
{{if .PullRequest}} — {{svg "octicon-info"}} -
<span>{{$.locale.Tr "repo.settings.pull_request_read_hint"}}</span> {{end}}
</i>
</div>
</div>
@@ -85,10 +85,10 @@
<div class="ui small basic delete modal">
<div class="ui header">
{{svg "octicon-trash" 16 "mr-2"}}
delete
{{.locale.Tr "repo.settings.secret_deletion"}}
</div>
<div class="content">
<p>detail</p>
<p>{{.locale.Tr "repo.settings.secret_deletion_desc"}}</p>
</div>
{{template "base/delete_modal_actions" .}}
</div>

5
templates/repo/settings/secrets.tmpl
View File

@@ -18,7 +18,7 @@
</div>
<div class="field {{if .Err_Content}}error{{end}}">
<label for="content">{{.locale.Tr "repo.settings.secret_content"}}</label>
<textarea id="ssh-key-content" name="content" placeholder="{{.locale.Tr "settings.secret_value_content_placeholder"}}" required>{{.content}}</textarea>
<textarea id="ssh-key-content" name="content" placeholder="{{.locale.Tr "repo.settings.secret_value_content_placeholder"}}" required>{{.content}}</textarea>
</div>
<div class="field">
<div class="ui checkbox {{if .Err_IsWritable}}error{{end}}">
@@ -55,7 +55,8 @@
{{Shadow .Data}}
</div>
<div class="activity meta">
<i>{{$.locale.Tr "settings.add_on"}} <span>{{.CreatedUnix.FormatShort}}</span> — {{svg "octicon-info"}} - <span>{{if .PullRequest}} {{$.locale.Tr "repo.settings.pull_request_read_info"}} {{end}}</span></i>
<i>{{$.locale.Tr "settings.add_on"}} <span>{{.CreatedUnix.FormatShort}}</span>
{{if .PullRequest}} — {{svg "octicon-info"}} - <span> {{$.locale.Tr "repo.settings.pull_request_read_hint"}} </span>{{end}}</i>
</div>
</div>
</div>