Update the previous touched file for reqAct

Signed-off-by: AvengerMoJo <[email protected]>

Author: AvengerMoJo

models/repo/repo_unit.go

@@ -205,6 +205,10 @@ func (cfg *ActionsConfig) EnableGlobalWorkflow(file string) {
 	cfg.EnabledGlobalWorkflows = append(cfg.EnabledGlobalWorkflows, file)
 }
 
+func (cfg *ActionsConfig) GetGlobalWorkflow() []string {
+	return cfg.EnabledGlobalWorkflows
+}
+
 // FromDB fills up a ActionsConfig from serialized format.
 func (cfg *ActionsConfig) FromDB(bs []byte) error {
 	return json.UnmarshalHandleDoubleEncode(bs, &cfg)
@@ -215,6 +219,10 @@ func (cfg *ActionsConfig) ToDB() ([]byte, error) {
 	return json.Marshal(cfg)
 }
 
+type FindEnabledGlobalWorkflowsOptions struct {
+	db.ListOptions
+}
+
 // ProjectsMode represents the projects enabled for a repository
 type ProjectsMode string
 

options/locale/locale_en-US.ini

@@ -3623,9 +3623,11 @@ runners.reset_registration_token_success = Runner registration token reset succe
 
 require_actions = Require Actions
 require_actions.require_actions_manage_panel = Require Actions Management Panel
+require_actions.enable_global_workflow = How to Enable Global Workflow
 require_actions.id = ID
 require_actions.name = Name
-require_actions.new = Create New
+require_actions.add = Add Global Workflow
+require_actions.add_require_actions = Enable selected Workflow
 require_actions.status = Status
 require_actions.version = Version
 require_actions.repo = Repo

routers/web/repo/actions/actions.go

@@ -156,7 +156,6 @@ func List(ctx *context.Context) {
 		ctx.Data["AllowDisableOrEnableWorkflow"] = true
 		ctx.Data["CurWorkflowDisabled"] = actionsConfig.IsWorkflowDisabled(workflow)
 		ctx.Data["CurGlobalWorkflowEnable"] = actionsConfig.IsGlobalWorkflowEnabled(workflow)
-		
 		isGlobal = actionsConfig.IsGlobalWorkflowEnabled(workflow)
 	}
 

routers/web/web.go

@@ -451,11 +451,14 @@ func registerRoutes(m *web.Route) {
 	// WIP RequireAction
 	addSettingsRequireActionsRoutes := func() {
 		m.Group("/require_actions", func() {
-			m.Get("", repo_setting.RequireActions)
-			m.Combo("/{require_action_id}").Get(repo_setting.RequireActionsUpdate).
-				Post(web.Bind(forms.EditRequireActionForm{}), repo_setting.RequireActionsUpdatePost)
-			m.Post("/require_action_id}/delete", repo_setting.RequireActionsDeletePost)
-
+			m.Get("", repo_setting.RequireActionsList)
+			m.Post("", web.Bind(forms.EditRequireActionForm{}), repo_setting.RequireActionsCreate)
+			m.Post("/add", web.Bind(forms.EditRequireActionForm{}), repo_setting.RequireActionsCreate)
+			/*
+				m.Combo("/{require_action_id}").Get(repo_setting.RequireActionsUpdate).
+					Post(web.Bind(forms.EditRequireActionForm{}), repo_setting.RequireActionsUpdatePost)
+				m.Post("/require_action_id}/delete", repo_setting.RequireActionsDeletePost)
+			*/
 		})
 	}
 

templates/org/settings/actions.tmpl

@@ -1,6 +1,8 @@
 {{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings actions")}}
 	<div class="org-setting-content">
-	{{if eq .PageType "runners"}}
+	{{if eq .PageType "require_actions"}}
+		{{template "shared/actions/require_action_list" .}}
+	{{else if eq .PageType "runners"}}
 		{{template "shared/actions/runner_list" .}}
 	{{else if eq .PageType "secrets"}}
 		{{template "shared/secrets/add_list" .}}

templates/org/settings/navbar.tmpl

@@ -29,6 +29,9 @@
 		<details class="item toggleable-item" {{if or .PageIsSharedSettingsRunners .PageIsSharedSettingsSecrets .PageIsSharedSettingsVariables}}open{{end}}>
 			<summary>{{ctx.Locale.Tr "actions.actions"}}</summary>
 			<div class="menu">
+				<a class="{{if .PageIsSharedSettingsRequireActions}}active {{end}}item" href="{{.OrgLink}}/settings/actions/require_actions">
+				  {{ctx.Locale.Tr "actions.require_actions"}}
+				</a>
 				<a class="{{if .PageIsSharedSettingsRunners}}active {{end}}item" href="{{.OrgLink}}/settings/actions/runners">
 					{{ctx.Locale.Tr "actions.runners"}}
 				</a>