marinofaggiana 6 жил өмнө
parent
commit
0cddbf28f6

+ 4 - 1
iOSClient/Share/CCSharePermissionOC.m

@@ -200,8 +200,11 @@
     else
     else
         permission = [UtilsFramework getPermissionsValueByCanEdit:[rowEdit.value boolValue] andCanCreate:[rowCreate.value boolValue] andCanChange:[rowChange.value boolValue] andCanDelete:[rowDelete.value boolValue] andCanShare:[rowShare.value boolValue] andIsFolder:shareDto.isDirectory];
         permission = [UtilsFramework getPermissionsValueByCanEdit:[rowEdit.value boolValue] andCanCreate:[rowCreate.value boolValue] andCanChange:[rowChange.value boolValue] andCanDelete:[rowDelete.value boolValue] andCanShare:[rowShare.value boolValue] andIsFolder:shareDto.isDirectory];
     
     
-    if (permission != shareDto.permissions)
+    if (permission != shareDto.permissions) {
         [self updateShare:self.idRemoteShared metadata:self.metadata serverUrl:self.serverUrl password:nil expirationTime:nil permission:permission hideDownload:false];
         [self updateShare:self.idRemoteShared metadata:self.metadata serverUrl:self.serverUrl password:nil expirationTime:nil permission:permission hideDownload:false];
+    } else {
+        [self dismissViewControllerAnimated:YES completion:nil];
+    }
 }
 }
 
 
 @end
 @end

+ 8 - 8
iOSClient/Share/CCShareUserOC.m

@@ -166,19 +166,19 @@
             
             
             OCShareUser *item = [self.users objectAtIndex:[num integerValue]];
             OCShareUser *item = [self.users objectAtIndex:[num integerValue]];
             [self shareUserAndGroup:item.name shareeType:item.shareeType permission:permission metadata:self.metadata serverUrl:self.serverUrl];
             [self shareUserAndGroup:item.name shareeType:item.shareeType permission:permission metadata:self.metadata serverUrl:self.serverUrl];
+            
+            return;
         }
         }
     }
     }
     
     
-    // start share with a user if not be i 
-    if ([self.directUser isEqual:[NSNull null]] == NO) {
-    
-        if ([self.directUser length] > 0 && [self.directUser isEqualToString:appDelegate.activeUser] == NO) {
+    if ([self.directUser isEqual:[NSNull null]] == NO && [self.directUser length] > 0 && [self.directUser isEqualToString:appDelegate.activeUser] == NO) {
         
         
-            // User/Group/Federate
-            [self shareUserAndGroup:self.directUser shareeType:self.shareType permission:permission metadata:self.metadata serverUrl:self.serverUrl];
-        }
-    }
+        [self shareUserAndGroup:self.directUser shareeType:self.shareType permission:permission metadata:self.metadata serverUrl:self.serverUrl];
+        
+    } else {
     
     
+        [self dismissViewControllerAnimated:YES completion:nil];
+    }
 }
 }
 
 
 #pragma --------------------------------------------------------------------------------------------
 #pragma --------------------------------------------------------------------------------------------