mirror of
				https://codeberg.org/forgejo/forgejo.git
				synced 2025-11-04 08:21:11 +00:00 
			
		
		
		
	Backport #23655
Before, in project edit page, the cancel button is not work.
https://user-images.githubusercontent.com/33891828/227182731-6478e29f-0e52-48c4-beb0-6a7d1dda6a1d.mov
1. The wrong classname `cancel` was added to the `<a>` tag. That
classname caused the default click event of `<a>` tag to be cancelled.
Because we have the following settings in the global. So I remove the
classname `cancel`.
9be90a5875/web_src/js/features/common-global.js (L325-L327)
2. Another change is that page will redirect to the previous page.
https://user-images.githubusercontent.com/33891828/227187326-c653c6d6-9715-440f-a732-ba0a6f012c81.mov
	
	
This commit is contained in:
		
					parent
					
						
							
								1cad923b36
							
						
					
				
			
			
				commit
				
					
						863da7d5a1
					
				
			
		
					 4 changed files with 5 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -232,9 +232,11 @@ func EditProject(ctx *context.Context) {
 | 
			
		|||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	ctx.Data["projectID"] = p.ID
 | 
			
		||||
	ctx.Data["title"] = p.Title
 | 
			
		||||
	ctx.Data["content"] = p.Description
 | 
			
		||||
	ctx.Data["redirect"] = ctx.FormString("redirect")
 | 
			
		||||
	ctx.Data["HomeLink"] = ctx.ContextUser.HomeLink()
 | 
			
		||||
 | 
			
		||||
	ctx.HTML(http.StatusOK, tplProjectsNew)
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -232,6 +232,7 @@ func EditProject(ctx *context.Context) {
 | 
			
		|||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	ctx.Data["projectID"] = p.ID
 | 
			
		||||
	ctx.Data["title"] = p.Title
 | 
			
		||||
	ctx.Data["content"] = p.Description
 | 
			
		||||
	ctx.Data["card_type"] = p.CardType
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -48,7 +48,7 @@
 | 
			
		|||
				<div class="ui divider"></div>
 | 
			
		||||
				<div class="ui left">
 | 
			
		||||
					{{if .PageIsEditProjects}}
 | 
			
		||||
					<a class="ui primary basic button" href="{{.RepoLink}}/projects">
 | 
			
		||||
					<a class="ui primary basic button" href="{{$.HomeLink}}/-/projects{{if eq .redirect "project"}}/{{.projectID}}{{end}}">
 | 
			
		||||
						{{.locale.Tr "repo.milestones.cancel"}}
 | 
			
		||||
					</a>
 | 
			
		||||
					<button class="ui green button">
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -72,7 +72,7 @@
 | 
			
		|||
				<div class="ui divider"></div>
 | 
			
		||||
				<div class="ui left">
 | 
			
		||||
					{{if .PageIsEditProjects}}
 | 
			
		||||
					<a class="ui primary basic button" href="{{.RepoLink}}/projects">
 | 
			
		||||
					<a class="ui primary basic button" href="{{.RepoLink}}/projects{{if eq .redirect "project"}}/{{.projectID}}{{end}}">
 | 
			
		||||
						{{.locale.Tr "repo.milestones.cancel"}}
 | 
			
		||||
					</a>
 | 
			
		||||
					<button class="ui green button">
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue