From: wolfgang <wolfgang@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Fri, 9 Nov 2007 16:40:49 +0000 (+0000)
Subject: git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1258 d1b88da0-ebda-0310... 
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87757acfbf0dc98062ba14fb0d16d8463298c07b;p=scalable-opengroupware.org

git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1258 d1b88da0-ebda-0310-925b-ed51d893ca5b
---

diff --git a/ChangeLog b/ChangeLog
index ac03ed80..6ed07242 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-11-09  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/SOGoUI/UIxComponent.m ([UIxComponent -canCreateOrModify]):
+	new boolean accessor that determines whether someone can create
+	(i.e. modify a new entry) or modify an existing entry.
+
 	* SoObjects/SOGo/SOGoObject.m ([SOGoObject
 	-lookupName:lookupNameinContext:localContextacquire:acquire]):
 	overriden method to bind looked up keys to So methods but by
diff --git a/UI/Contacts/product.plist b/UI/Contacts/product.plist
index 1168ddcf..1b4d7eb3 100644
--- a/UI/Contacts/product.plist
+++ b/UI/Contacts/product.plist
@@ -158,25 +158,10 @@
 	      protectedBy = "<public>";
               pageName    = "UIxContactView";
            };
-/*           delete = {
-              protectedBy = "View";
-              pageName    = "UIxContactView";
-              actionName  = "delete";
-           }; */
            edit = {
-              protectedBy = "Access Contents Information";
-              pageName    = "UIxContactEditor";
-           };
-/*           save = {
-              protectedBy = "View";
+              protectedBy = "<public>";
               pageName    = "UIxContactEditor";
-              actionName  = "save";
            };
-           write = {
-              protectedBy = "View";
-              pageName    = "UIxContactEditor";
-              actionName  = "write";
-           }; */
         };
      };
   };
diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m
index efbe22c9..a376ba60 100644
--- a/UI/SOGoUI/UIxComponent.m
+++ b/UI/SOGoUI/UIxComponent.m
@@ -35,11 +35,13 @@
 #import <NGExtensions/NSString+misc.h>
 #import <NGExtensions/NSURL+misc.h>
 
+#import <SoObjects/SOGo/NSCalendarDate+SOGo.h>
+#import <SoObjects/SOGo/NSString+Utilities.h>
 #import <SoObjects/SOGo/SOGoUser.h>
 #import <SoObjects/SOGo/SOGoObject.h>
+#import <SoObjects/SOGo/SOGoContentObject.h>
 #import <SoObjects/SOGo/SOGoCustomGroupFolder.h>
-#import <SoObjects/SOGo/NSCalendarDate+SOGo.h>
-#import <SoObjects/SOGo/NSString+Utilities.h>
+#import <SoObjects/SOGo/SOGoPermissions.h>
 
 #import "UIxJSClose.h"
 
@@ -423,6 +425,18 @@ static BOOL uixDebugEnabled = NO;
   return jsClose;
 }
 
+/* common conditions */
+- (BOOL) canCreateOrModify
+{
+  SoSecurityManager *sm;
+
+  sm = [SoSecurityManager sharedSecurityManager];
+
+  return (![sm validatePermission: SoPerm_ChangeImagesAndFiles
+	       onObject: [self clientObject]
+	       inContext: context]);
+}
+
 /* SoUser */
 
 - (NSString *) shortUserNameForDisplay
diff --git a/UI/Templates/ContactsUI/UIxContactEditor.wox b/UI/Templates/ContactsUI/UIxContactEditor.wox
index af3e3b02..fa69e46d 100644
--- a/UI/Templates/ContactsUI/UIxContactEditor.wox
+++ b/UI/Templates/ContactsUI/UIxContactEditor.wox
@@ -335,11 +335,12 @@
         </div>
       </div>
       <div id="buttons">
-        <input
-          type="submit"
-          class="button"
-          label:value="Save"
-          name="save:method" />
+	<var:if condition="canCreateOrModify"
+	  ><input
+	    type="submit"
+	    class="button"
+	    label:value="Save"
+	    name="save:method" /></var:if>
         <input
           type="submit"
           class="button"