From 195d747c5d12b0afb95d0d1ff4e2d7edb5c477fc Mon Sep 17 00:00:00 2001
From: HFO4 <912394456@qq.com>
Date: Fri, 7 Sep 2018 20:48:13 +0800
Subject: [PATCH] fix: error displaying capacity unit while editing user group

---
 application/index/model/FileManage.php       | 12 ------------
 application/index/view/admin/edit_group.html |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/application/index/model/FileManage.php b/application/index/model/FileManage.php
index 57cf4310..d22162c6 100644
--- a/application/index/model/FileManage.php
+++ b/application/index/model/FileManage.php
@@ -765,18 +765,6 @@ class FileManage extends Model{
 		}
 	}
 
-	public function qiniuDownload(){
-		if(!$this->policyData['bucket_private']){
-			$fileUrl = $this->policyData["url"].$this->fileData["pre_name"]."?attname=".urlencode($this->fileData["orign_name"]);
-			return[true,$fileUrl];
-		}else{
-			$auth = new Auth($this->policyData["ak"], $this->policyData["sk"]);
-			$baseUrl = $this->policyData["url"].$this->fileData["pre_name"]."?attname=".urlencode($this->fileData["orign_name"]);
-			$signedUrl = $auth->privateDownloadUrl($baseUrl);
-			return[true,$signedUrl];
-		}
-	}
-
 	public function upyunDownload(){
 		return [true,$this->upyunPreview()[1]."&_upd=".urlencode($this->fileData["orign_name"])];
 	}
diff --git a/application/index/view/admin/edit_group.html b/application/index/view/admin/edit_group.html
index 9706123b..ad678ec2 100644
--- a/application/index/view/admin/edit_group.html
+++ b/application/index/view/admin/edit_group.html
@@ -174,7 +174,7 @@
 <script src="/static/js/admin/add_group.js"></script>
 <script type="text/javascript">
 $("option[value='{$group.policy_name}']").attr("selected",true);
-$("option[value='{$group.max_storage}']").attr("selected",true);
+$("option[value='{:countSize($group.max_storage,true)[1]}']").attr("selected",true);
 $("input[name='range_transfer'][value='{$group.range_transfer}']").attr("checked",true);
 $("input[name='allow_share'][value='{$group.allow_share}']").attr("checked",true);
 $("input[name='color'][value='{$group.color}']").attr("checked",true);