From 0c841f27236d01cbf57321fde0be6b1cc302becb Mon Sep 17 00:00:00 2001
From: nyne <me@nyne.dev>
Date: Fri, 1 Aug 2025 17:30:12 +0800
Subject: [PATCH] Improve collection permission.

---
 frontend/src/pages/collection_page.tsx        | 14 ++++++-------
 frontend/src/pages/create_collection_page.tsx | 12 +++++------
 frontend/src/pages/user_page.tsx              |  9 ++++----
 server/dao/collection.go                      | 21 ++++++++++++-------
 4 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/frontend/src/pages/collection_page.tsx b/frontend/src/pages/collection_page.tsx
index e8c3c32..535dd70 100644
--- a/frontend/src/pages/collection_page.tsx
+++ b/frontend/src/pages/collection_page.tsx
@@ -6,7 +6,7 @@ import { Collection } from "../network/models";
 import Markdown from "react-markdown";
 import ResourcesView from "../components/resources_view";
 import Loading from "../components/loading";
-import { MdOutlineAdd, MdOutlineDelete, MdOutlineEdit } from "react-icons/md";
+import { MdOutlineDelete, MdOutlineEdit, MdOutlineLock } from "react-icons/md";
 import { app } from "../app";
 import { useTranslation } from "../utils/i18n";
 import Button from "../components/button";
@@ -163,8 +163,8 @@ export default function CollectionPage() {
           )}
           <span className="flex-1" />
           {!collection.isPublic && (
-            <Badge className="badge-soft badge-error text-xs mr-2">
-              <MdOutlineAdd size={16} className="inline-block" /> {t("Private")}
+            <Badge className="badge-soft badge-error text-xs mr-2 shadow-xs">
+              <MdOutlineLock size={16} className="inline-block" /> {t("Private")}
             </Badge>
           )}
         </div>
@@ -344,15 +344,15 @@ function EditCollectionDialog({
           onChange={(e) => setEditArticle(e.target.value)}
           disabled={editLoading}
         />
-        <label className="flex items-center mb-4">
+        <label className="flex items-center mb-4 mt-2">
           <input
             type="checkbox"
-            checked={editIsPublic}
-            onChange={(e) => setEditIsPublic(e.target.checked)}
+            checked={!editIsPublic}
+            onChange={(e) => setEditIsPublic(!e.target.checked)}
             className="checkbox mr-2"
             disabled={editLoading}
           />
-          {t("Public")}
+          {t("Private")}
         </label>
         <div className="modal-action">
           <button className="btn" onClick={onClose} disabled={editLoading}>
diff --git a/frontend/src/pages/create_collection_page.tsx b/frontend/src/pages/create_collection_page.tsx
index 08b566e..a9bb540 100644
--- a/frontend/src/pages/create_collection_page.tsx
+++ b/frontend/src/pages/create_collection_page.tsx
@@ -111,15 +111,15 @@ export default function CreateCollectionPage() {
           onChange={(e) => setArticle(e.target.value)}
           className="textarea mt-1 w-full min-h-80"
         />
-        <div className="mt-4">
-          <label className="flex items-center">
+        <div className="mt-4 mx-1">
+          <label className="flex items-center py-2">
             <input
               type="checkbox"
-              checked={isPublic}
-              onChange={(e) => setIsPublic(e.target.checked)}
-              className="checkbox mr-2"
+              checked={!isPublic}
+              onChange={(e) => setIsPublic(!e.target.checked)}
+              className="checkbox mr-2 checkbox-primary"
             />
-            {t("Public")}
+            {t("Private")}
           </label>
         </div>
       </div>
diff --git a/frontend/src/pages/user_page.tsx b/frontend/src/pages/user_page.tsx
index bbac8aa..2b8464a 100644
--- a/frontend/src/pages/user_page.tsx
+++ b/frontend/src/pages/user_page.tsx
@@ -18,6 +18,7 @@ import {
   MdOutlineAdd,
   MdOutlineArchive,
   MdOutlineComment,
+  MdOutlineLock,
   MdOutlinePhotoAlbum,
 } from "react-icons/md";
 import { useTranslation } from "../utils/i18n";
@@ -526,10 +527,10 @@ function CollectionCard({ collection }: { collection: Collection }) {
         </Badge>
         <span className="flex-1" />
         {!collection.isPublic && (
-          <Badge className="badge-soft badge-error text-xs mr-2">
-            <MdOutlineAdd size={16} className="inline-block" /> {t("Private")}
-          </Badge>
-        )}
+                    <Badge className="badge-soft badge-error text-xs mr-2 shadow-xs">
+                      <MdOutlineLock size={16} className="inline-block" /> {t("Private")}
+                    </Badge>
+                  )}
       </div>
     </div>
   );
diff --git a/server/dao/collection.go b/server/dao/collection.go
index 04503fb..460167f 100644
--- a/server/dao/collection.go
+++ b/server/dao/collection.go
@@ -35,16 +35,21 @@ func CreateCollection(uid uint, title string, article string, images []uint, pub
 
 func UpdateCollection(id uint, title string, article string, images []uint, public bool) error {
 	return db.Transaction(func(tx *gorm.DB) error {
-		collection := &model.Collection{
-			Model: gorm.Model{
-				ID: id,
-			},
-			Title:   title,
-			Article: article,
-			Public:  public, // 新增
+		collection := &model.Collection{}
+
+		// First find the existing collection
+		if err := tx.Where("id = ?", id).First(collection).Error; err != nil {
+			return err
 		}
 
-		if err := tx.Model(collection).Updates(collection).Error; err != nil {
+		// Update the fields
+		updates := map[string]interface{}{
+			"title":   title,
+			"article": article,
+			"public":  public,
+		}
+
+		if err := tx.Model(collection).Updates(updates).Error; err != nil {
 			return err
 		}