fix names

Author: wxiaoguang

models/actions/variable.go

@@ -95,7 +95,7 @@ func FindVariables(ctx context.Context, opts FindVariablesOpts) ([]*ActionVariab
 	return db.Find[ActionVariable](ctx, opts)
 }
 
-func UpdateVariable(ctx context.Context, variable *ActionVariable, cols ...string) (bool, error) {
+func UpdateVariableCols(ctx context.Context, variable *ActionVariable, cols ...string) (bool, error) {
 	count, err := db.GetEngine(ctx).
 		ID(variable.ID).
 		Cols(cols...).

routers/api/v1/org/action.go

@@ -454,7 +454,7 @@ func (Action) UpdateVariable(ctx *context.APIContext) {
 	v.Name = opt.Name
 	v.Data = opt.Value
 
-	if _, err := actions_service.UpdateVariable(ctx, v); err != nil {
+	if _, err := actions_service.UpdateVariableNameData(ctx, v); err != nil {
 		if errors.Is(err, util.ErrInvalidArgument) {
 			ctx.Error(http.StatusBadRequest, "UpdateVariable", err)
 		} else {

routers/api/v1/repo/action.go

@@ -418,7 +418,7 @@ func (Action) UpdateVariable(ctx *context.APIContext) {
 	v.Name = opt.Name
 	v.Data = opt.Value
 
-	if _, err := actions_service.UpdateVariable(ctx, v); err != nil {
+	if _, err := actions_service.UpdateVariableNameData(ctx, v); err != nil {
 		if errors.Is(err, util.ErrInvalidArgument) {
 			ctx.Error(http.StatusBadRequest, "UpdateVariable", err)
 		} else {

routers/api/v1/user/action.go

@@ -216,7 +216,7 @@ func UpdateVariable(ctx *context.APIContext) {
 	v.Name = opt.Name
 	v.Data = opt.Value
 
-	if _, err := actions_service.UpdateVariable(ctx, v); err != nil {
+	if _, err := actions_service.UpdateVariableNameData(ctx, v); err != nil {
 		if errors.Is(err, util.ErrInvalidArgument) {
 			ctx.Error(http.StatusBadRequest, "UpdateVariable", err)
 		} else {

routers/web/shared/actions/variables.go

@@ -149,16 +149,16 @@ func VariableUpdate(ctx *context.Context) {
 
 	id := ctx.PathParamInt64("variable_id")
 
-	variable, ok := findVariable(ctx, id, vCtx)
-	if !ok {
+	variable := findActionsVariable(ctx, id, vCtx)
+	if ctx.Written() {
 		return
 	}
 
 	form := web.GetForm(ctx).(*forms.EditVariableForm)
 	variable.Name = form.Name
 	variable.Data = form.Data
 
-	if ok, err := actions_service.UpdateVariable(ctx, variable); err != nil || !ok {
+	if ok, err := actions_service.UpdateVariableNameData(ctx, variable); err != nil || !ok {
 		log.Error("UpdateVariable: %v", err)
 		ctx.JSONError(ctx.Tr("actions.variables.update.failed"))
 		return
@@ -167,31 +167,36 @@ func VariableUpdate(ctx *context.Context) {
 	ctx.JSONRedirect(vCtx.RedirectLink)
 }
 
-func findVariable(ctx *context.Context, id int64, vCtx *variablesCtx) (*actions_model.ActionVariable, bool) {
+func findActionsVariable(ctx *context.Context, id int64, vCtx *variablesCtx) *actions_model.ActionVariable {
 	opts := actions_model.FindVariablesOpts{
 		IDs: []int64{id},
 	}
 	switch {
 	case vCtx.IsRepo:
 		opts.RepoID = vCtx.RepoID
+		if opts.RepoID == 0 {
+			panic("RepoID is 0")
+		}
 	case vCtx.IsOrg, vCtx.IsUser:
 		opts.OwnerID = vCtx.OwnerID
+		if opts.OwnerID == 0 {
+			panic("OwnerID is 0")
+		}
 	case vCtx.IsGlobal:
 		// do nothing
 	default:
-		ctx.ServerError("findVariable", errors.New("unable to determine"))
-		return nil, false
+		panic("invalid actions variable")
 	}
 
 	got, err := actions_model.FindVariables(ctx, opts)
 	if err != nil {
 		ctx.ServerError("FindVariables", err)
-		return nil, false
+		return nil
 	} else if len(got) == 0 {
 		ctx.NotFound("FindVariables", nil)
-		return nil, false
+		return nil
 	}
-	return got[0], true
+	return got[0]
 }
 
 func VariableDelete(ctx *context.Context) {
@@ -203,8 +208,8 @@ func VariableDelete(ctx *context.Context) {
 
 	id := ctx.PathParamInt64("variable_id")
 
-	variable, ok := findVariable(ctx, id, vCtx)
-	if !ok {
+	variable := findActionsVariable(ctx, id, vCtx)
+	if ctx.Written() {
 		return
 	}
 

services/actions/variables.go

@@ -30,7 +30,7 @@ func CreateVariable(ctx context.Context, ownerID, repoID int64, name, data strin
 	return v, nil
 }
 
-func UpdateVariable(ctx context.Context, variable *actions_model.ActionVariable) (bool, error) {
+func UpdateVariableNameData(ctx context.Context, variable *actions_model.ActionVariable) (bool, error) {
 	if err := secret_service.ValidateName(variable.Name); err != nil {
 		return false, err
 	}
@@ -41,7 +41,7 @@ func UpdateVariable(ctx context.Context, variable *actions_model.ActionVariable)
 
 	variable.Data = util.ReserveLineBreakForTextarea(variable.Data)
 
-	return actions_model.UpdateVariable(ctx, variable, "name", "data")
+	return actions_model.UpdateVariableCols(ctx, variable, "name", "data")
 }
 
 func DeleteVariableByID(ctx context.Context, variableID int64) error {