fix

Author: lunny

routers/web/user/package.go

@@ -8,7 +8,6 @@ import (
 	"errors"
 	"net/http"
 	"net/url"
-	"strings"
 
 	"code.gitea.io/gitea/models/db"
 	org_model "code.gitea.io/gitea/models/organization"
@@ -432,7 +431,6 @@ func PackageSettings(ctx *context.Context) {
 	ctx.Data["Title"] = pd.Package.Name
 	ctx.Data["IsPackagesPage"] = true
 	ctx.Data["PackageDescriptor"] = pd
-	ctx.Data["OwnerID"] = pd.Owner.ID
 	ctx.Data["CanWritePackages"] = ctx.Package.AccessMode >= perm.AccessModeWrite || ctx.IsUserSiteAdmin()
 
 	if pd.Package.RepoID > 0 {
@@ -441,7 +439,7 @@ func PackageSettings(ctx *context.Context) {
 			ctx.ServerError("GetRepositoryByID", err)
 			return
 		}
-		ctx.Data["LinkedRepoFullName"] = repo.FullName()
+		ctx.Data["LinkedRepoName"] = repo.Name
 	}
 
 	ctx.HTML(http.StatusOK, tplPackagesSettings)
@@ -454,37 +452,29 @@ func PackageSettingsPost(ctx *context.Context) {
 	form := web.GetForm(ctx).(*forms.PackageSettingForm)
 	switch form.Action {
 	case "link":
-		if form.RepoFullName == "" { // remove the link
+		if form.RepoName == "" { // remove the link
 			if err := packages_model.SetRepositoryLink(ctx, pd.Package.ID, 0); err != nil {
-				ctx.Flash.Error(ctx.Tr("packages.settings.unlink.error"))
-			} else {
-				ctx.Flash.Success(ctx.Tr("packages.settings.unlink.success"))
+				ctx.JSONError(ctx.Tr("packages.settings.unlink.error"))
+				return
 			}
+
+			ctx.Flash.Success(ctx.Tr("packages.settings.unlink.success"))
 			ctx.JSONRedirect("")
 			return
 		}
 
-		owner, name, _ := strings.Cut(form.RepoFullName, "/")
-		repo, err := repo_model.GetRepositoryByOwnerAndName(ctx, owner, name)
+		repo, err := repo_model.GetRepositoryByName(ctx, pd.Owner.ID, form.RepoName)
 		if err != nil {
 			if repo_model.IsErrRepoNotExist(err) {
-				ctx.Flash.Error(ctx.Tr("packages.settings.link.repo_not_found", form.RepoFullName))
-				ctx.JSONRedirect("")
+				ctx.JSONError(ctx.Tr("packages.settings.link.repo_not_found", form.RepoName))
 			} else {
 				ctx.ServerError("GetRepositoryByOwnerAndName", err)
 			}
 			return
 		}
 
-		if repo.OwnerID != pd.Owner.ID {
-			ctx.Flash.Error(ctx.Tr("packages.settings.link.repo_not_found", form.RepoFullName))
-			ctx.JSONRedirect("")
-			return
-		}
-
 		if err := packages_model.SetRepositoryLink(ctx, pd.Package.ID, repo.ID); err != nil {
-			ctx.Flash.Error(ctx.Tr("packages.settings.link.error"))
-			ctx.JSONRedirect("")
+			ctx.JSONError(ctx.Tr("packages.settings.link.error"))
 			return
 		}
 

services/forms/user_form.go

@@ -416,8 +416,8 @@ func (f *WebauthnDeleteForm) Validate(req *http.Request, errs binding.Errors) bi
 
 // PackageSettingForm form for package settings
 type PackageSettingForm struct {
-	Action       string
-	RepoFullName string `form:"repo_full_name"`
+	Action   string
+	RepoName string `form:"repo_name"`
 }
 
 // Validate validates the fields

templates/package/settings.tmpl

@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings options{{if .ContextUser.IsOrganization}} organization{{end}}">
+<div role="main" aria-label="{{.Title}}" class="page-content package settings options{{if .ContextUser.IsOrganization}} organization{{end}}">
 	{{if .ContextUser.IsOrganization}}
 		{{template "org/header" .}}
 	{{else}}
@@ -19,9 +19,9 @@
 			<form class="ui form form-fetch-action ignore-dirty tw-flex-1 tw-flex" action="{{.Link}}" method="post">
 				{{.CsrfTokenHtml}}
 				<input type="hidden" name="action" value="link">
-				<div id="search-repo-box" class="ui search" data-full-name="true" data-uid="{{.OwnerID}}">
+				<div id="search-repo-box" class="ui search" data-uid="{{.PackageDescriptor.Owner.ID}}">
 					<div class="ui input">
-						<input class="prompt" name="repo_full_name" value="{{.LinkedRepoFullName}}" placeholder="{{ctx.Locale.Tr "search.repo_kind"}}" autocomplete="off">
+						<input class="prompt" name="repo_name" value="{{.LinkedRepoName}}" placeholder="{{ctx.Locale.Tr "search.repo_kind"}}" autocomplete="off">
 					</div>
 				</div>
 				<button class="ui primary button tw-ml-2">{{ctx.Locale.Tr "packages.settings.link.button"}}</button>

web_src/js/features/comp/SearchRepoBox.ts

@@ -3,20 +3,21 @@ import {fomanticQuery} from '../../modules/fomantic/base.ts';
 const {appSubUrl} = window.config;
 
 export function initCompSearchRepoBox() {
-  // on the page "page-content organization teams"
+  // on the page "page-content organization teams" and "page-content package settings"
+  const searchRepobox = document.querySelector('#search-repo-box');
+  if (!searchRepobox) return;
+
+  const uid = searchRepobox.getAttribute('data-uid');
+
   const $searchRepoBox = fomanticQuery('#search-repo-box');
-  const showFullName = $searchRepoBox.data('full-name');
   $searchRepoBox.search({
     minCharacters: 2,
     apiSettings: {
-      url: `${appSubUrl}/repo/search?q={query}&uid=${$searchRepoBox.data('uid')}`,
+      url: `${appSubUrl}/repo/search?q={query}&uid=${uid}`,
       onResponse(response: any) {
         const items = [];
         for (const item of response.data) {
           let title = item.repository.full_name.split('/')[1];
-          if (showFullName) {
-            title = item.repository.full_name;
-          }
           items.push({
             title,
             description: item.repository.full_name,

web_src/js/features/package-setting.ts

@@ -1,5 +1,6 @@
 import {initCompSearchRepoBox} from './comp/SearchRepoBox.ts';
 
 export function initPackageSettings() {
+  if (!document.querySelector('.page-content.package.settings')) return;
   initCompSearchRepoBox();
 }