From fa831f54ef07a9a8ad4f172e0cbd2ba3c5426aed Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Wed, 23 Feb 2022 09:29:57 +0800
Subject: [PATCH] =?UTF-8?q?fix-1504=20fix-1493=20=E5=92=8C=20=E5=85=AC?=
 =?UTF-8?q?=E5=91=8A=E6=97=A0=E9=85=8D=E7=BD=AE=E6=97=B6=EF=BC=8Cconsole?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/base/head.tmpl                   | 14 +++++++++-----
 templates/base/head_fluid.tmpl             | 14 +++++++++-----
 templates/base/head_home.tmpl              | 14 +++++++++-----
 templates/base/head_pro.tmpl               | 14 +++++++++-----
 templates/repo/header.tmpl                 |  2 +-
 templates/repo/modelarts/notebook/new.tmpl |  2 +-
 6 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index 10015a61b..2cecee52b 100755
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -226,10 +226,12 @@ var _hmt = _hmt || [];
 		}
 		let isShowNoticeTag = false;
 		let notices= {{.notices.Notices}}
-		for (i =0;i<notices.length;i++){
-			if (notices[i].Visible==1){
-				isShowNoticeTag =true;
-				break;
+		if(notices != null && notices!=''){
+			for (i =0;i<notices.length;i++){
+				if (notices[i].Visible==1){
+					isShowNoticeTag =true;
+					break;
+				}
 			}
 		}
 		if (isShowNoticeTag){
@@ -245,7 +247,9 @@ var _hmt = _hmt || [];
 
 			}
 		}else{
-			document.getElementById("notic_content").style.display='none'
+			if (document.getElementById("notic_content") != null){
+				document.getElementById("notic_content").style.display='none'
+			}
 		}
 	}
 	
diff --git a/templates/base/head_fluid.tmpl b/templates/base/head_fluid.tmpl
index ad5464dcc..59e542b0b 100644
--- a/templates/base/head_fluid.tmpl
+++ b/templates/base/head_fluid.tmpl
@@ -227,10 +227,12 @@ var _hmt = _hmt || [];
 		}
 		let isShowNoticeTag = false;
 		let notices= {{.notices.Notices}}
-		for (i =0;i<notices.length;i++){
-			if (notices[i].Visible==1){
-				isShowNoticeTag =true;
-				break;
+		if(notices != null && notices!=''){
+			for (i =0;i<notices.length;i++){
+				if (notices[i].Visible==1){
+					isShowNoticeTag =true;
+					break;
+				}
 			}
 		}
 		if (isShowNoticeTag){
@@ -246,7 +248,9 @@ var _hmt = _hmt || [];
 
 			}
 		}else{
-			document.getElementById("notic_content").style.display='none'
+			if (document.getElementById("notic_content") != null){
+				document.getElementById("notic_content").style.display='none'
+			}
 		}
 	}
 	
diff --git a/templates/base/head_home.tmpl b/templates/base/head_home.tmpl
index 47919133e..561edd5ce 100644
--- a/templates/base/head_home.tmpl
+++ b/templates/base/head_home.tmpl
@@ -231,10 +231,12 @@ var _hmt = _hmt || [];
 		}
 		let isShowNoticeTag = false;
 		let notices= {{.notices.Notices}}
-		for (i =0;i<notices.length;i++){
-			if (notices[i].Visible==1){
-				isShowNoticeTag =true;
-				break;
+		if(notices != null && notices!=''){
+			for (i =0;i<notices.length;i++){
+				if (notices[i].Visible==1){
+					isShowNoticeTag =true;
+					break;
+				}
 			}
 		}
 		if (isShowNoticeTag){
@@ -250,7 +252,9 @@ var _hmt = _hmt || [];
 
 			}
 		}else{
-			document.getElementById("notic_content").style.display='none'
+			if (document.getElementById("notic_content") != null){
+				document.getElementById("notic_content").style.display='none'
+			}
 		}
 	}
 	
diff --git a/templates/base/head_pro.tmpl b/templates/base/head_pro.tmpl
index 85719cf9b..82543ac61 100644
--- a/templates/base/head_pro.tmpl
+++ b/templates/base/head_pro.tmpl
@@ -228,10 +228,12 @@ var _hmt = _hmt || [];
 		}
 		let isShowNoticeTag = false;
 		let notices= {{.notices.Notices}}
-		for (i =0;i<notices.length;i++){
-			if (notices[i].Visible==1){
-				isShowNoticeTag =true;
-				break;
+		if(notices != null && notices!=''){
+			for (i =0;i<notices.length;i++){
+				if (notices[i].Visible==1){
+					isShowNoticeTag =true;
+					break;
+				}
 			}
 		}
 		if (isShowNoticeTag){
@@ -247,7 +249,9 @@ var _hmt = _hmt || [];
 
 			}
 		}else{
-			document.getElementById("notic_content").style.display='none'
+			if (document.getElementById("notic_content") != null){
+				document.getElementById("notic_content").style.display='none'
+			}
 		}
 	}
 	
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index e99d9f705..be3df93b8 100755
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -132,7 +132,7 @@
 				{{end}} -->
 
 				{{if and .Repository.CanEnablePulls (.Permission.CanRead $.UnitTypePullRequests)}}
-					<a class="{{if .PageIsPullList}}active{{end}} item" href="{{.RepoLink}}/pulls">
+					<a class="{{if or .PageIsComparePull .PageIsPullList}}active{{end}} item" href="{{.RepoLink}}/pulls">
 						{{svg "octicon-git-pull-request" 16}} {{.i18n.Tr "repo.pulls"}} <span class="ui {{if not .Repository.NumOpenPulls}}gray{{else}}blue{{end}} small label">{{.Repository.NumOpenPulls}}</span>
 					</a>
 				{{end}}
diff --git a/templates/repo/modelarts/notebook/new.tmpl b/templates/repo/modelarts/notebook/new.tmpl
index 4bf63ac81..fb6e3c9be 100755
--- a/templates/repo/modelarts/notebook/new.tmpl
+++ b/templates/repo/modelarts/notebook/new.tmpl
@@ -19,7 +19,7 @@
     <div class="repository new repo ui middle very relaxed page grid">
         <div class="column">
             {{template "base/alert" .}}
-            <div class="ui positive message" id="messageInfo">
+            <div class="ui negative message" id="messageInfo">
                     <p></p>
             </div>
             <form class="ui form" id="form_id" action="{{.Link}}" method="post">