complete

routers/web/web.go

@@ -762,6 +762,7 @@ func registerRoutes(m *web.Route) {
 					m.Get("", org_setting.RedirectToDefaultSetting)
 					addSettingsRunnersRoutes()
 					addSettingsSecretsRoutes()
+					addSettingVariablesRoutes()
 				}, actions.MustEnableActions)
 
 				m.RouteMethods("/delete", "GET,POST", org.SettingsDelete)

templates/shared/variables/variable_list.tmpl

@@ -73,10 +73,10 @@
 				>
 			</div>
 			<div class="field">
-				<label for="secret-content">{{.locale.Tr "actions.variables.value"}}</label>
+				<label for="variable-content">{{.locale.Tr "actions.variables.value"}}</label>
 				<textarea required
-					id="secret-content"
 					name="data"
+					id="variable-content"
 					placeholder="{{.locale.Tr "secrets.creation.value_placeholder"}}">
 				</textarea>
 			</div>

web_src/js/features/repo-legacy.js

@@ -19,7 +19,7 @@ import {initRepoDiffConversationNav} from './repo-diff.js';
 import {createDropzone} from './dropzone.js';
 import {initCommentContent, initMarkupContent} from '../markup/content.js';
 import {initCompReactionSelector} from './comp/ReactionSelector.js';
-import {initRepoSettingBranches, initRepoSettingVariables} from './repo-settings.js';
+import {initRepoSettingBranches} from './repo-settings.js';
 import {initRepoPullRequestMergeForm} from './repo-issue-pr-form.js';
 import {hideElem, showElem} from '../utils/dom.js';
 import {getComboMarkdownEditor, initComboMarkdownEditor} from './comp/ComboMarkdownEditor.js';
@@ -532,7 +532,6 @@ export function initRepository() {
   initCitationFileCopyContent();
   initRepoCommonLanguageStats();
   initRepoSettingBranches();
-  initRepoSettingVariables();
 
   // Issues
   if ($('.repository.view.issue').length > 0) {

web_src/js/features/repo-settings.js

@@ -82,38 +82,3 @@ export function initRepoSettingBranches() {
     if (this.checked) $target.addClass('disabled'); // only disable, do not auto enable
   });
 }
-
-export function initRepoSettingVariables() {
-  $('.show-variable-edit-modal').on('click', function () {
-    const target = $(this).attr('data-modal');
-    const $modal = $(target);
-    // clear input/textarea value
-    $modal.find('input[name=name]').val('');
-    $modal.find('textarea[name=data]').val('');
-    // set dialog header
-    const $header = $modal.find('#variable-edit-header');
-    $header.text($(this).attr('data-modal-header'));
-
-    if ($(this).attr('data-is-new') === 'false') {
-      // edit variable dialog
-      const oldName = $(this).attr('data-old-name');
-      const oldValue = $(this).attr('data-old-value');
-      $modal.find('input[name=name]').val(oldName);
-      $modal.find('textarea[name=data]').val(oldValue);
-    }
-
-    const url = $(this).attr('data-base-action');
-    const commitButton = $modal.find('.actions > .ok.button');
-    $(commitButton).on('click', (e) => {
-      e.preventDefault();
-      $.post(url, {
-        _csrf: csrfToken,
-        name: $modal.find('input[name=name]').val(),
-        data: $modal.find('textarea[name=data]').val(),
-      }, (data) => {
-        if (data.redirect) window.location.href = data.redirect;
-        else window.location.reload();
-      });
-    });
-  });
-}

web_src/js/features/shared.js

@@ -0,0 +1,38 @@
+import $ from 'jquery';
+
+const {csrfToken} = window.config;
+
+export function initSettingVariables() {
+  $('.show-variable-edit-modal').on('click', function () {
+    const target = $(this).attr('data-modal');
+    const $modal = $(target);
+    // clear input/textarea value
+    $modal.find('input[name=name]').val('');
+    $modal.find('textarea[name=data]').val('');
+    // set dialog header
+    const $header = $modal.find('#variable-edit-header');
+    $header.text($(this).attr('data-modal-header'));
+
+    if ($(this).attr('data-is-new') === 'false') {
+      // edit variable dialog
+      const oldName = $(this).attr('data-old-name');
+      const oldValue = $(this).attr('data-old-value');
+      $modal.find('input[name=name]').val(oldName);
+      $modal.find('textarea[name=data]').val(oldValue);
+    }
+
+    const url = $(this).attr('data-base-action');
+    const commitButton = $modal.find('.actions > .ok.button');
+    $(commitButton).on('click', (e) => {
+      e.preventDefault();
+      $.post(url, {
+        _csrf: csrfToken,
+        name: $modal.find('input[name=name]').val(),
+        data: $modal.find('textarea[name=data]').val(),
+      }, (data) => {
+        if (data.redirect) window.location.href = data.redirect;
+        else window.location.reload();
+      });
+    });
+  });
+}

web_src/js/index.js

@@ -80,7 +80,8 @@ import {initRepositoryActionView} from './components/RepoActionView.vue';
 import {initGlobalTooltips} from './modules/tippy.js';
 import {initGiteaFomantic} from './modules/fomantic.js';
 import {onDomReady} from './utils/dom.js';
-import {initRepoIssueList} from './features/repo-issue-list.js';
+import { initRepoIssueList } from './features/repo-issue-list.js';
+import {initSettingVariables} from './features/shared.js';
 
 // Init Gitea's Fomantic settings
 initGiteaFomantic();
@@ -175,4 +176,5 @@ onDomReady(() => {
   initUserAuthWebAuthnRegister();
   initUserSettings();
   initRepoDiffView();
+  initSettingVariables();
 });