Merge branch '6086-website-redirect-type-proxy-re-sets-to-no-redirect-when-switching-tabs' into 'develop'

Marius Burkard · Marius Burkard · commit 829c0e4a384e · 2021-03-10T06:51:05.000Z
Resolve "Website Redirect Type: proxy re-sets to No redirect when switching tabs"

Closes #6086

See merge request ispconfig/ispconfig3!1428
diff --git a/interface/web/sites/templates/web_vhost_domain_redirect.htm b/interface/web/sites/templates/web_vhost_domain_redirect.htm
@@ -86,7 +86,7 @@
                 jQuery('#redirect_type option[value="redirect"]').hide();
                 jQuery('#redirect_type option[value="permanent"]').hide();
 				//jQuery('#redirect_type option[value="proxy"]').hide();
-                if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+                if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L" && selected != "proxy") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
 				jQuery('.nginx').hide();
             }
         });

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@`
`86`	`86`	`jQuery('#redirect_type option[value="redirect"]').hide();`
`87`	`87`	`jQuery('#redirect_type option[value="permanent"]').hide();`
`88`	`88`	`//jQuery('#redirect_type option[value="proxy"]').hide();`
`89`		`- if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');`
	`89`	`+ if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L" && selected != "proxy") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');`
`90`	`90`	`jQuery('.nginx').hide();`
`91`	`91`	`}`
`92`	`92`	`});`