From e3e7b943ef532a7695fdee447072b99ac5a45979 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Mon, 21 Aug 2023 10:40:59 +0800
Subject: [PATCH 1/2] #4439

---
 templates/repo/datasets/index.tmpl | 2 +-
 web_src/js/index.js                | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/templates/repo/datasets/index.tmpl b/templates/repo/datasets/index.tmpl
index 21eb84f430..85053f3dff 100755
--- a/templates/repo/datasets/index.tmpl
+++ b/templates/repo/datasets/index.tmpl
@@ -180,7 +180,7 @@
               <i class="ri-heart-fill" ></i>
               <span style="margin-left: 0.3rem;font-size: 0.7rem;">{{$.i18n.Tr "dataset.unfavorite"}}</span>
             </button>
-            <button v-else class="ui mini basic button" style="display: flex;align-items: center;padding:0.5rem;border: #888888;border-top-right-radius: 0;border-bottom-right-radius: 0;margin-right: -1px;">
+            <button v-else class="ui mini basic button" style="display: flex;align-items: center;padding:0.5rem;border: #888888;border-top-right-radius: 0;border-bottom-right-radius: 0;margin-right: -1px;" @click="goLogin">
               <i class="ri-heart-line" style="color: #FA8C16;"></i>
               <span style="margin-left: 0.3rem;font-size: 0.7rem;">{{$.i18n.Tr "dataset.favorite"}}</span>
             </button>
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 578791b5ff..c7a7d144f4 100755
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -4285,6 +4285,9 @@ function initVueDataset() {
             console.log(err);
           });
       },
+      goLogin() {
+        window.location.href = `/user/login?redirect_to=${encodeURIComponent(window.location.href)}`;
+      },
       postStar(id, link) {
         if (this.star_active) {
           let url = link + "/" + id + "/unstar";
-- 
2.34.1


From b76e17e1a0c1058ef90243991e8e9aab1fb3e92a Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 22 Aug 2023 09:21:37 +0800
Subject: [PATCH 2/2] #4636

---
 templates/base/head_navbar.tmpl       | 8 ++++----
 templates/base/head_navbar_fluid.tmpl | 8 ++++----
 templates/base/head_navbar_home.tmpl  | 8 ++++----
 templates/base/head_navbar_pro.tmpl   | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl
index 7e4fa95a84..5f42d0bf25 100755
--- a/templates/base/head_navbar.tmpl
+++ b/templates/base/head_navbar.tmpl
@@ -58,13 +58,13 @@
 					{{/* <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> */}}
 					<a class="item" href="{{AppSubUrl}}/kanban/index.html" target="_blank" rel="opener">{{.i18n.Tr "explore.data_analysis"}}</a>
 				{{end}}
-				<a class="item" target="_blank" href="https://course.openi.org.cn"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
+				<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=9c23803d-b190-4b33-a59a-01a65f439bce&redirect_uri=https://course.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
 				<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
 				<a class="item" href="{{AppSubUrl}}/tech/tech_view">科技2030项目</a>
 			 
 			</div>
 		</div>
-		<a class="item" target="_blank" href="https://bbs.openi.org.cn/"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
+		<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=08ed2763-e77b-4326-b06d-fab35338fe05&redirect_uri=https://bbs.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
 	{{else if .IsLandingPageHome}}
 		<div class="item edge">
 			<div class="dropdown-menu">
@@ -106,13 +106,13 @@
 					{{/* <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> */}}
 					<a class="item" href="{{AppSubUrl}}/kanban/index.html" target="_blank" rel="opener">{{.i18n.Tr "explore.data_analysis"}}</a>
 				{{end}}
-				<a class="item" target="_blank" href="https://course.openi.org.cn"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
+				<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=9c23803d-b190-4b33-a59a-01a65f439bce&redirect_uri=https://course.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
 				<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
 				<a class="item" href="{{AppSubUrl}}/tech/tech_view">科技2030项目</a>
 		 
 			</div>
 		</div>
-		<a class="item" target="_blank" href="https://bbs.openi.org.cn/"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
+		<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=08ed2763-e77b-4326-b06d-fab35338fe05&redirect_uri=https://bbs.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
 	{{else if .IsLandingPageExplore}}
 		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos/square">{{.i18n.Tr "home"}}</a>
 	{{else if .IsLandingPageOrganizations}}
diff --git a/templates/base/head_navbar_fluid.tmpl b/templates/base/head_navbar_fluid.tmpl
index 70cc3a27f7..af9a6a323f 100644
--- a/templates/base/head_navbar_fluid.tmpl
+++ b/templates/base/head_navbar_fluid.tmpl
@@ -55,12 +55,12 @@
 					{{/* <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> */}}
 					<a class="item" href="{{AppSubUrl}}/kanban/index.html" target="_blank" rel="opener">{{.i18n.Tr "explore.data_analysis"}}</a>
 				{{end}}
-				<a class="item" target="_blank" href="https://course.openi.org.cn"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
+				<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=9c23803d-b190-4b33-a59a-01a65f439bce&redirect_uri=https://course.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
 				<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
 				<a class="item" href="{{AppSubUrl}}/tech/tech_view">科技2030项目</a>
 			</div>
 		</div>
-		<a class="item" target="_blank" href="https://bbs.openi.org.cn/"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
+		<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=08ed2763-e77b-4326-b06d-fab35338fe05&redirect_uri=https://bbs.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
 	{{else if .IsLandingPageHome}}
 		<div class="item edge" >
 			<div class="dropdown-menu">
@@ -100,13 +100,13 @@
 					{{/* <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> */}}
 					<a class="item" href="{{AppSubUrl}}/kanban/index.html" target="_blank" rel="opener">{{.i18n.Tr "explore.data_analysis"}}</a>
 				{{end}}
-				<a class="item" target="_blank" href="https://course.openi.org.cn"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
+				<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=9c23803d-b190-4b33-a59a-01a65f439bce&redirect_uri=https://course.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
 				<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
 				<a class="item" href="{{AppSubUrl}}/tech/tech_view">科技2030项目</a>
 	 
 			</div>
 		</div>
-		<a class="item" target="_blank" href="https://bbs.openi.org.cn/"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
+		<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=08ed2763-e77b-4326-b06d-fab35338fe05&redirect_uri=https://bbs.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
 	{{else if .IsLandingPageExplore}}
 		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos/square">{{.i18n.Tr "home"}}</a>
 	{{else if .IsLandingPageOrganizations}}
diff --git a/templates/base/head_navbar_home.tmpl b/templates/base/head_navbar_home.tmpl
index fa051d15a3..e25d925e4a 100644
--- a/templates/base/head_navbar_home.tmpl
+++ b/templates/base/head_navbar_home.tmpl
@@ -47,13 +47,13 @@
 					{{/* <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> */}}
 					<a class="item" href="{{AppSubUrl}}/kanban/index.html" target="_blank" rel="opener">{{.i18n.Tr "explore.data_analysis"}}</a>
 				{{end}}	
-				<a class="item" target="_blank" href="https://course.openi.org.cn"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
+				<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=9c23803d-b190-4b33-a59a-01a65f439bce&redirect_uri=https://course.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
 				<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
 				<a class="item" href="{{AppSubUrl}}/tech/tech_view">科技2030项目</a>
 			 
 			</div>
 		</div>
-		<a class="item" target="_blank" href="https://bbs.openi.org.cn/"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
+		<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=08ed2763-e77b-4326-b06d-fab35338fe05&redirect_uri=https://bbs.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
 	{{else if .IsLandingPageHome}}
 		<div class="item edge" >
 			<div class="dropdown-menu">
@@ -94,13 +94,13 @@
 					{{/* <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> */}}
 					<a class="item" href="{{AppSubUrl}}/kanban/index.html" target="_blank" rel="opener">{{.i18n.Tr "explore.data_analysis"}}</a>
 				{{end}}
-				<a class="item" target="_blank" href="https://course.openi.org.cn"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
+				<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=9c23803d-b190-4b33-a59a-01a65f439bce&redirect_uri=https://course.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
 				<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
 				<a class="item" href="{{AppSubUrl}}/tech/tech_view">科技2030项目</a>
 				 
 			</div>
 		</div>
-		<a class="item" target="_blank" href="https://bbs.openi.org.cn/"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
+		<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=08ed2763-e77b-4326-b06d-fab35338fe05&redirect_uri=https://bbs.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
 	{{else if .IsLandingPageExplore}}
 		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos/square">{{.i18n.Tr "home"}}</a>
 	{{else if .IsLandingPageOrganizations}}
diff --git a/templates/base/head_navbar_pro.tmpl b/templates/base/head_navbar_pro.tmpl
index 99b7248819..8bfc0af72b 100644
--- a/templates/base/head_navbar_pro.tmpl
+++ b/templates/base/head_navbar_pro.tmpl
@@ -57,13 +57,13 @@
 					{{/* <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> */}}
 					<a class="item" href="{{AppSubUrl}}/kanban/index.html" target="_blank" rel="opener">{{.i18n.Tr "explore.data_analysis"}}</a>
 				{{end}}
-				<a class="item" target="_blank" href="https://course.openi.org.cn"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
+				<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=9c23803d-b190-4b33-a59a-01a65f439bce&redirect_uri=https://course.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
 				<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
 				<a class="item" href="{{AppSubUrl}}/tech/tech_view">科技2030项目</a>
 			 
 			</div>
 		</div> 
-		<a class="item" target="_blank" href="https://bbs.openi.org.cn/"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
+		<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=08ed2763-e77b-4326-b06d-fab35338fe05&redirect_uri=https://bbs.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
 	{{else if .IsLandingPageHome}}
 		<div class="item edge">
 			<div class="dropdown-menu">
@@ -104,13 +104,13 @@
 					{{/* <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> */}}
 					<a class="item" href="{{AppSubUrl}}/kanban/index.html" target="_blank" rel="opener">{{.i18n.Tr "explore.data_analysis"}}</a>
 				{{end}}
-				<a class="item" target="_blank" href="https://course.openi.org.cn"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
+				<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=9c23803d-b190-4b33-a59a-01a65f439bce&redirect_uri=https://course.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
 				<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
 				<a class="item" href="{{AppSubUrl}}/tech/tech_view">科技2030项目</a>
 				 
 			</div>
 		</div>
-		<a class="item" target="_blank" href="https://bbs.openi.org.cn/"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
+		<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=08ed2763-e77b-4326-b06d-fab35338fe05&redirect_uri=https://bbs.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
 	{{else if .IsLandingPageExplore}}
 		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos/square">{{.i18n.Tr "home"}}</a>
 	{{else if .IsLandingPageOrganizations}}
-- 
2.34.1