Răsfoiți Sursa

GW-6410 Added dropdown button for link sharing security setting & Added translation & Modifed method name

hakumizuki 4 ani în urmă
părinte
comite
982bdbc98f

+ 6 - 0
resource/locales/en_US/translation.json

@@ -583,6 +583,12 @@
       "restricted": "Restricted (Requires approval by administrators)",
       "closed": "Closed (Invitation Only)"
     },
+    "share_link_rights": "Share link rights",
+    "link_sharing": "Link sharing",
+    "link_sharing_rights_choices": {
+      "allow": "Allow",
+      "deny": "Deny"
+    },
     "configuration": " Configuration",
     "optional": "Optional",
     "Treat username matching as identical": "Automatically bind external accounts newly logged in to local accounts when <code>username</code> match",

+ 6 - 0
resource/locales/ja_JP/translation.json

@@ -582,6 +582,12 @@
       "restricted": "制限 (登録完了には管理者の承認が必要)",
       "closed": "非公開 (登録には管理者による招待が必要)"
     },
+    "share_link_rights": "シェアリンクの権限",
+    "link_sharing": "リンクのシェア",
+    "link_sharing_rights_choices": {
+      "allow": "許可",
+      "deny": "許可しない"
+    },
     "configuration": "設定",
     "optional": "オプション",
     "Treat username matching as identical": "新規ログイン時、<code>username</code> が一致したローカルアカウントが存在した場合は自動的に紐付ける",

+ 6 - 0
resource/locales/zh_CN/translation.json

@@ -571,6 +571,12 @@
 			"restricted": "受限(需要管理员批准)",
 			"closed": "已关闭(仅限邀请)"
 		},
+    "share_link_rights": "分享链接权",
+    "link_sharing": "链接共享",
+    "link_sharing_rights_choices": {
+      "allow": "允许",
+      "deny": "拒绝"
+    },
 		"configuration": " 配置",
 		"optional": "可选的",
 		"Treat username matching as identical": "Automatically bind external accounts newly logged in to local accounts when <code>username</code> match",

+ 11 - 11
src/client/js/components/Admin/Security/ShareLinkSetting.jsx

@@ -67,7 +67,7 @@ class ShareLinkSetting extends React.Component {
 
   }
 
-  async putShareLinkSettings() {
+  async putShareLinkSetting() {
     const { t, adminGeneralSecurityContainer } = this.props;
     try {
       await adminGeneralSecurityContainer.updateGeneralSecuritySetting();
@@ -120,7 +120,7 @@ class ShareLinkSetting extends React.Component {
   render() {
     const { t, adminGeneralSecurityContainer } = this.props;
     const {
-      shareLinks, shareLinksActivePage, totalshareLinks, shareLinksPagingLimit,
+      shareLinks, shareLinksActivePage, totalshareLinks, shareLinksPagingLimit, disableLinkSharing,
     } = adminGeneralSecurityContainer.state;
 
     return (
@@ -137,10 +137,10 @@ class ShareLinkSetting extends React.Component {
           <h2 className="alert-anchor border-bottom">{t('share_links.share_link_management')}</h2>
         </div>
         {/* ここにShareLink Settingのdropdown button */}
-        {/* <h4>{t('security_setting.page_access_and_delete_rights')}</h4>
+        <h4>{t('security_setting.share_link_rights')}</h4>
         <div className="row mb-4">
           <div className="col-md-3 text-md-right py-2">
-            <strong>{t('security_setting.Guest Users Access')}</strong>
+            <strong>{t('security_setting.link_sharing')}</strong>
           </div>
           <div className="col-md-9">
             <div className="dropdown">
@@ -154,21 +154,21 @@ class ShareLinkSetting extends React.Component {
                 aria-expanded="true"
               >
                 <span className="float-left">
-                  {currentRestrictGuestMode === 'Deny' && t('security_setting.guest_mode.deny')}
-                  {currentRestrictGuestMode === 'Readonly' && t('security_setting.guest_mode.readonly')}
+                  {disableLinkSharing === 'Allow' && t('security_setting.link_sharing_rights_choices.allow')}
+                  {disableLinkSharing === 'Deny' && t('security_setting.link_sharing_rights_choices.deny')}
                 </span>
               </button>
               <div className="dropdown-menu" aria-labelledby="dropdownMenuButton">
-                <button className="dropdown-item" type="button" onClick={() => { adminGeneralSecurityContainer.changeRestrictGuestMode('Deny') }}>
-                  {t('security_setting.guest_mode.deny')}
+                <button className="dropdown-item" type="button" onClick={() => { adminGeneralSecurityContainer.setDisableLinkSharing('Allow') }}>
+                  {t('security_setting.link_sharing_rights_choices.allow')}
                 </button>
-                <button className="dropdown-item" type="button" onClick={() => { adminGeneralSecurityContainer.changeRestrictGuestMode('Readonly') }}>
-                  {t('security_setting.guest_mode.readonly')}
+                <button className="dropdown-item" type="button" onClick={() => { adminGeneralSecurityContainer.setDisableLinkSharing('Deny') }}>
+                  {t('security_setting.link_sharing_rights_choices.deny')}
                 </button>
               </div>
             </div>
           </div>
-        </div> */}
+        </div>
         <Pager
           links={shareLinks}
           activePage={shareLinksActivePage}

+ 8 - 1
src/client/js/services/AdminGeneralSecurityContainer.js

@@ -90,6 +90,13 @@ export default class AdminGeneralSecurityContainer extends Container {
     this.setState({ sessionMaxAge });
   }
 
+  /**
+   * setter for disableLinkSharing
+   */
+  setDisableLinkSharing(disableLinkSharing) {
+    this.setState({ disableLinkSharing });
+  }
+
   /**
    * Change restrictGuestMode
    */
@@ -148,7 +155,7 @@ export default class AdminGeneralSecurityContainer extends Container {
       disableLinkSharing: this.state.disableLinkSharing,
     };
 
-    requestParams = await removeNullPropertyFromObject(requestParams);  // 要チェック
+    requestParams = await removeNullPropertyFromObject(requestParams);
     const response = await this.appContainer.apiv3.put('/security-setting/general-setting', requestParams);
     const { securitySettingParams } = response.data;
     return securitySettingParams;