Changeset 7094 for main/waeup.sirp/trunk

Timestamp:

12 Nov 2011, 21:14:46 (13 years ago)

Author:

Henrik Bettermann

Message:

Remove self.context._p_changed = True. In my opinion it's not necessary here.

Define default image paths on waeup.sirp.browser/init.py. We need the same definitions for other packages.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• applicants/browser.py (modified) (4 diffs)
• applicants/interfaces.py (modified) (2 diffs)
• browser/__init__.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py

@@ -57 +57 @@
     IWAeUPObject, ILocalRolesAssignable, IExtFileStore, IFileStoreNameChooser)
 from waeup.sirp.permissions import get_users_with_local_roles
+from waeup.sirp.browser import DEFAULT_PASSPORT_IMAGE_PATH
 from waeup.sirp.university.interfaces import ICertificate
 from waeup.sirp.utils.helpers import string_from_bytes, file_size
@@ -68 +69 @@
     IApplicant, IApplicantPrincipal,IApplicantEdit, IApplicantsRoot,
     IApplicantsContainer, IApplicantsContainerAdd, application_types_vocab,
-    DEFAULT_PASSPORT_IMAGE_PATH, MAX_UPLOAD_SIZE,
+    MAX_UPLOAD_SIZE,
     )
 from waeup.sirp.applicants.workflow import INITIALIZED, STARTED
@@ -770 +771 @@
         if self.passport_changed:
             fields_string += ' + passport'
-        self.context._p_changed = True
+        #self.context._p_changed = True
         form = self.request.form
         trans_id = form.get('transition', None)
@@ -819 +820 @@
             return # error during image upload. Ignore other values
         self.applyData(self.context, **data)
-        self.context._p_changed = True
+        #self.context._p_changed = True
         self.flash('Form has been saved.')
         return

main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py

@@ -24 +24 @@
 import os
 import re
-import waeup.sirp.browser
 
 from grokcore.content.interfaces import IContainer
@@ -44 +43 @@
   )
 
-IMAGE_PATH = os.path.join(
-    os.path.dirname(waeup.sirp.browser.__file__),
-    'static'
-    )
-
-#: Filesystem path to default passport image
-DEFAULT_PASSPORT_IMAGE_PATH = os.path.join(IMAGE_PATH, 'placeholder_m.jpg')
-
 #: Maximum upload size for applicant passport photographs (in bytes)
 MAX_UPLOAD_SIZE = 1024 * 20

main/waeup.sirp/trunk/src/waeup/sirp/browser/__init__.py

@@ +1 @@
+import os
+
 from waeup.sirp.browser.layout import (
     WAeUPPage, WAeUPLayout, WAeUPDisplayFormPage, WAeUPEditFormPage,
     WAeUPAddFormPage, NullValidator)
+
+IMAGE_PATH = os.path.join(
+    os.path.dirname(__file__),
+    'static'
+    )
+
+#: Filesystem paths to default images
+DEFAULT_IMAGE_PATH = os.path.join(IMAGE_PATH, 'placeholder_m.jpg')
+DEFAULT_PASSPORT_IMAGE_PATH = os.path.join(IMAGE_PATH, 'placeholder_m.jpg')