Changeset 2344 for WAeUP_SRP/base

Timestamp:

10 Oct 2007, 21:33:35 (17 years ago)

Author:

Henrik Bettermann

Message:

some fixes in Widgets.py and in application_pde.xml

DateTime? Widgets must never been required!

Location:

WAeUP_SRP/base

Files:

• Widgets.py (modified) (3 diffs)
• skins/waeup_layout/widget_passport_render.pt (modified) (3 diffs)

WAeUP_SRP/base/Widgets.py

@@ -1387 +1387 @@
             do = 0
             err ='You are not a Student. PIN neither checked nor used.'
-            s_logger.info('%s tried to use scratch card %s' % (s_id,pin_str))
+            s_logger.info('%s tried to use scratch card %s' % (member_id,pin_str))
         elif len(b) > 1 and b.find('-') > -1:
             do = 0
@@ -1744 +1744 @@
             if not os.path.exists(base_path):
                 os.mkdir(base_path)
-            full_path = os.path.join(base_path, file_name)
+            full_path = os.path.join(base_path, filename)
             pict = open(full_path,"w")
             fileupload.seek(0)
@@ -1786 +1786 @@
     id_field = ""
     show_image = False
-    
+
     def getImageInfo(self, datastructure): ###(
         """Get the file info from the datastructure."""

WAeUP_SRP/base/skins/waeup_layout/widget_passport_render.pt

@@ -22 +22 @@
   </span>
   <tal:block condition="python: mode == 'edit'">
-    <metal:block use-macro="here/widget_file_render/macros/file_size_max_view" />
+    
     <metal:block define-macro="image_title_edit">
       <span tal:condition="python:0">
@@ -31 +31 @@
     <img tal:condition="python:not empty_file and not session_file"
          tal:replace="structure image_tag" />
+         
     <metal:block define-macro="image_edit">
       <metal:block use-macro="here/widget_file_render/macros/file_edit">
@@ -45 +46 @@
       </metal:block>
     </metal:block>
+  <metal:block use-macro="here/widget_file_render/macros/file_size_max_view" />
+  
   </tal:block>
 </tal:block>