mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-03-28 13:53:04 -04:00
f7873ba393
Forgejo's UI claims that whitespace is removed from the beginning and the end of the values of Forgejo Actions variables and secrets. However, that is not correct. The entered values are stored as-is. Only CRLF is replaced with LF, which is also the desired behaviour. This PR changes the incorrect text which is also no longer displayed as placeholder but as a proper help text below the input fields. Furthermore, tests were added to verify the behaviour. While adding tests, I discovered and fixed another inconsistency. Depending on whether secrets were managed using the UI or the HTTP API, they were treated differently. CRLF in secrets entered in the UI was correctly replaced with LF while secrets created using the HTTP API kept CRLF. Fixes #11003. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/11052 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Co-authored-by: Andreas Ahlenstorf <andreas@ahlenstorf.ch> Co-committed-by: Andreas Ahlenstorf <andreas@ahlenstorf.ch>
91 lines
2.9 KiB
Go HTML Template
91 lines
2.9 KiB
Go HTML Template
<h4 class="ui top attached header">
|
|
{{ctx.Locale.Tr "actions.variables.management"}}
|
|
<div class="ui right">
|
|
<button class="ui primary tiny button show-modal"
|
|
data-modal="#edit-variable-modal"
|
|
data-modal-form.action="{{.Link}}/new"
|
|
data-modal-header="{{ctx.Locale.Tr "actions.variables.creation"}}"
|
|
data-modal-dialog-variable-name=""
|
|
data-modal-dialog-variable-data=""
|
|
>
|
|
{{ctx.Locale.Tr "actions.variables.creation"}}
|
|
</button>
|
|
</div>
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
{{if .Variables}}
|
|
<div class="flex-list">
|
|
{{range .Variables}}
|
|
<div class="flex-item tw-items-center">
|
|
<div class="flex-item-leading">
|
|
{{svg "octicon-pencil" 32}}
|
|
</div>
|
|
<div class="flex-item-main">
|
|
<div class="flex-item-title">
|
|
{{.Name}}
|
|
</div>
|
|
<div class="flex-item-body">
|
|
{{.Data}}
|
|
</div>
|
|
</div>
|
|
<div class="flex-item-trailing">
|
|
<span class="color-text-light-2">
|
|
{{ctx.Locale.Tr "settings.added_on" (DateUtils.AbsoluteShort .CreatedUnix)}}
|
|
</span>
|
|
<button class="btn interact-bg tw-p-2 show-modal"
|
|
data-tooltip-content="{{ctx.Locale.Tr "actions.variables.edit"}}"
|
|
data-modal="#edit-variable-modal"
|
|
data-modal-form.action="{{$.Link}}/{{.ID}}/edit"
|
|
data-modal-header="{{ctx.Locale.Tr "actions.variables.edit"}}"
|
|
data-modal-dialog-variable-name="{{.Name}}"
|
|
data-modal-dialog-variable-data="{{.Data}}"
|
|
>
|
|
{{svg "octicon-pencil"}}
|
|
</button>
|
|
<button class="btn interact-bg tw-p-2 link-action"
|
|
data-tooltip-content="{{ctx.Locale.Tr "actions.variables.deletion"}}"
|
|
data-url="{{$.Link}}/{{.ID}}/delete"
|
|
data-modal-confirm="{{ctx.Locale.Tr "actions.variables.deletion.description"}}"
|
|
>
|
|
{{svg "octicon-trash"}}
|
|
</button>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{else}}
|
|
{{ctx.Locale.Tr "actions.variables.none"}}
|
|
{{end}}
|
|
</div>
|
|
|
|
{{/** Edit variable dialog */}}
|
|
<div class="ui small modal" id="edit-variable-modal">
|
|
<div class="header"></div>
|
|
<form class="ui form form-fetch-action" method="post">
|
|
<fieldset class="content">
|
|
<div class="field">
|
|
{{ctx.Locale.Tr "actions.variables.description"}}
|
|
</div>
|
|
<div class="field">
|
|
<label for="dialog-variable-name">{{ctx.Locale.Tr "name"}}</label>
|
|
<input autofocus required
|
|
name="name"
|
|
id="dialog-variable-name"
|
|
value="{{.name}}"
|
|
pattern="^(?!CI$)(?!FORGEJO_|GITEA_|GITHUB_)[a-zA-Z_][a-zA-Z0-9_]*$"
|
|
>
|
|
<p id="name-description" class="help">{{ctx.Locale.Tr "actions.variables.mutation.name_description"}}</p>
|
|
</div>
|
|
<div class="field">
|
|
<label for="dialog-variable-data">{{ctx.Locale.Tr "value"}}</label>
|
|
<textarea required
|
|
name="data"
|
|
id="dialog-variable-data"
|
|
></textarea>
|
|
<p id="data-description" class="help">{{ctx.Locale.Tr "actions.variables.mutation.value_description"}}</p>
|
|
</div>
|
|
</fieldset>
|
|
{{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}}
|
|
</form>
|
|
</div>
|
|
|