1.22 release

kalcaddle · Aug 7, 2021 · af8f20e · af8f20e
1 parent 80ef10c
commit af8f20e
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 22 deletions.
diff --git a/app/autoload.php b/app/autoload.php
diff --git a/app/controller/explorer/index.class.php b/app/controller/explorer/index.class.php
@@ -151,25 +151,46 @@ public function setAuth(){
 		));
 
 		$result = false;
-		$info   = IO::infoSimple($data['path']);
-		if( $info && $info['sourceID'] && 
-			$info['targetType'] == SourceModel::TYPE_GROUP){//只能设置部门文档;
+		$info   = IO::info($data['path']);
+		if( $info && $info['sourceID'] && $info['targetType'] == 'group'){//只能设置部门文档;
 			if($data['action'] == 'getData'){
 				$result = Model('SourceAuth')->getAuth($info['sourceID']);
 				show_json($result);
 			}
-			
+
 			//清空所有子文件(夹)的权限；
 			if($data['action'] == 'clearChildren'){
 				$result = Model('SourceAuth')->authClear($info['sourceID']);
 			}else{
-				$result = Model('SourceAuth')->setAuth($info['sourceID'],$data['auth']);
+				$setAuth = $this->setAuthSelf($info,$data['auth']);
+				$result = Model('SourceAuth')->setAuth($info['sourceID'],$setAuth);
 			}
 		}
 		$msg = !!$result ? LNG('explorer.success') : LNG('explorer.error');
 		show_json($msg,!!$result);
 	}
 
+	// 设置权限.默认设置自己为之前管理权限; 如果只有自己则清空;
+	private function setAuthSelf($pathInfo,$auth){
+		if(!$auth) return $auth;
+		$selfAuth = _get($pathInfo,'auth.authInfo.id','1');
+		$authList = array();
+		foreach($auth as $item){
+			if( $item['targetID'] == USER_ID && 
+				$item['targetType'] == SourceModel::TYPE_USER){
+				continue;
+			}
+			$authList[] = $item;
+		}
+		if(!$authList) return $authList;
+		$authList[] = array(
+			'targetID' 	=> USER_ID, 
+			'targetType'=> SourceModel::TYPE_USER,
+			'authID' 	=> $selfAuth
+		);
+		return $authList;
+	}
+
 	public function pathAllowCheck($path){
 		$notAllow = array('/', '\\', ':', '*', '?', '"', '<', '>', '|');
 		$parse = KodIO::parse($path);

diff --git a/plugins/webdav/package.json b/plugins/webdav/package.json
@@ -2,7 +2,7 @@
 	"id":"webdav",
 	"name":"{{LNG['webdav.meta.name']}}",
 	"title":"{{LNG['webdav.meta.title']}}",
-	"version":"1.25",
+	"version":"1.26",
 	"source":{
 		"className":" font-icon ri-hard-drive-fill-2 bg-yellow-6",
 		"icon":""

diff --git a/plugins/webdav/static/user.js b/plugins/webdav/static/user.js
@@ -58,7 +58,6 @@ ClassBase.define({
 					"1":{ //按钮名称
 						"display":LNG['webdav.user.morePath']+" <b class='caret'></b>",
 						"className":"btn-default btn-sm",
-						"attr":{"style":"margin-left:20%;"}
 					}
 				},
 				"switchItem":{"1":"pathAllowMore"}

diff --git a/static/app/dist/api.js b/static/app/dist/api.js
diff --git a/static/app/dist/lib.js b/static/app/dist/lib.js
diff --git a/static/app/dist/main.js b/static/app/dist/main.js
diff --git a/static/app/dist/sdk.js b/static/app/dist/sdk.js
diff --git a/static/app/dist/vendor.js b/static/app/dist/vendor.js
diff --git a/static/style/dist/main.css b/static/style/dist/main.css
diff --git a/static/style/dist/sdk.css b/static/style/dist/sdk.css
diff --git a/static/style/lib/main.css b/static/style/lib/main.css