chore: remove SOGoUI/UIxJSClose

Alinto · Jun 14, 2021 · 9dbb770 · 9dbb770
1 parent 89c31d8
commit 9dbb770
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 166 deletions.
diff --git a/UI/Common/UIxAclEditor.m b/UI/Common/UIxAclEditor.m
@@ -251,24 +251,6 @@ - (BOOL) shouldTakeValuesFromRequest: (WORequest *) request
   return ([[request method] isEqualToString: @"POST"]);
 }
 
-- (id <WOActionResults>) saveAclsAction
-{
-  NSEnumerator *aclsEnum;
-  SOGoObject *clientObject;
-  NSString *currentUID, *ownerLogin;
-
-  clientObject = [self clientObject];
-  ownerLogin = [clientObject ownerInContext: context];
-  aclsEnum = [[self aclsForObject] objectEnumerator];
-  while ((currentUID = [[aclsEnum nextObject] objectForKey: @"c_uid"]))
-    if ([currentUID isEqualToString: ownerLogin]
-        || [savedUIDs containsObject: currentUID])
-      [users removeObjectForKey: currentUID];
-  [clientObject removeAclsForUsers: [users allKeys]];
-
-  return [self jsCloseWithRefreshMethod: nil];
-}
-
 - (BOOL) isPublicAccessEnabled
 {
   return [[SOGoSystemDefaults sharedSystemDefaults] enablePublicAccess];

diff --git a/UI/SOGoUI/GNUmakefile b/UI/SOGoUI/GNUmakefile
@@ -15,14 +15,12 @@ ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
 
 libSOGoUI_HEADER_FILES +=	\
 	\
-	UIxJSClose.h		\
 	UIxComponent.h		\
 	SOGoAptFormatter.h	\
 	SOGoDirectAction.h
 
 libSOGoUI_OBJC_FILES +=		\
 	\
-	UIxJSClose.m		\
 	UIxComponent.m		\
 	UIxModuleAccessDenied.m	\
 	SOGoAptFormatter.m	\

diff --git a/UI/SOGoUI/UIxComponent.h b/UI/SOGoUI/UIxComponent.h
@@ -80,8 +80,6 @@
 
 - (BOOL) hideFrame;
 
-- (UIxComponent *) jsCloseWithRefreshMethod: (NSString *) methodName;
-
 /* SoUser */
 - (NSString *) shortUserNameForDisplay;
 

diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m
@@ -44,7 +44,7 @@
 #import <SOGo/WOContext+SOGo.h>
 #import <SOGo/WOResourceManager+SOGo.h>
 
-#import "UIxJSClose.h"
+#import "UIxComponent.h"
 
 
 @interface UIxComponent (PrivateAPI)
@@ -448,17 +448,6 @@ - (BOOL) hideFrame
   return ([[self queryParameterForKey: @"noframe"] boolValue]);
 }
 
-- (UIxComponent *) jsCloseWithRefreshMethod: (NSString *) methodName
-{
-  UIxJSClose *jsClose;
-
-  jsClose = [UIxJSClose new];
-  [jsClose autorelease];
-  [jsClose setRefreshMethod: [methodName doubleQuotedString]];
-
-  return jsClose;
-}
-
 /* common conditions */
 - (BOOL) canCreateOrModify
 {

diff --git a/UI/SOGoUI/UIxJSClose.h b/UI/SOGoUI/UIxJSClose.h
diff --git a/UI/SOGoUI/UIxJSClose.m b/UI/SOGoUI/UIxJSClose.m
diff --git a/UI/Templates/UIxJSClose.wox b/UI/Templates/UIxJSClose.wox