Index: /main/waeup.sirp/branches/ulif-extimgstore/src/waeup/sirp/applicants/browser.py
===================================================================
--- /main/waeup.sirp/branches/ulif-extimgstore/src/waeup/sirp/applicants/browser.py	(revision 7053)
+++ /main/waeup.sirp/branches/ulif-extimgstore/src/waeup/sirp/applicants/browser.py	(revision 7054)
@@ -656,5 +656,4 @@
         frame_body = Frame(1*cm,1*cm,width-(2*cm),height-(3.5*cm))
         story.append(Paragraph(self.label, style["Heading2"]))
-        #story.append(HRFlowable())
         story.append(Spacer(1, 18))
         for msg in self.context.history.messages:
@@ -662,17 +661,21 @@
             story.append(Paragraph(f_msg, style["Normal"]))
         story.append(Spacer(1, 24))
+
+        data = []
+        # insert passport photograph
+        img = getUtility(IExtFileStore).getFileByContext(self.context)
+        if img is None:
+            img = open(os.path.join(IMAGE_PATH, 'placeholder_m.jpg'), 'rb')
+        doc_img = Image(img.name, width=4*cm, height=3*cm, kind='bound')
+        data.append(['', doc_img])
+
+        # render widget fields
         self.setUpWidgets()
-        data = []
         for widget in self.widgets:
             f_label = '<font size=12>%s</font>:' % widget.label.strip()
             f_label = Paragraph(f_label, style["Normal"])
-            if widget.name != 'form.passport':
-                f_text = '<font size=12>%s</font>' % widget()
-                f_text = Paragraph(f_text, style["Normal"])
-                data.append([f_label,f_text])
-            else:
-                filename = widget._data.file.name
-                im = Image(filename,width=4*cm, height=3*cm,kind='bound')
-                data.append([f_label,im])
+            f_text = '<font size=12>%s</font>' % widget()
+            f_text = Paragraph(f_text, style["Normal"])
+            data.append([f_label,f_text])
         f_label = '<font size=12>Admitted Course of Study:</font>'
         f_text = '<font size=12>%s</font>' % self.getCourseAdmitted()
