Index: /main/waeup.futminna/trunk/src/waeup/futminna/applicants/tests/test_browser.py
===================================================================
--- /main/waeup.futminna/trunk/src/waeup/futminna/applicants/tests/test_browser.py	(revision 10202)
+++ /main/waeup.futminna/trunk/src/waeup/futminna/applicants/tests/test_browser.py	(revision 10203)
@@ -246,2 +246,14 @@
         fd = storage.getFile(file_id)
         self.assertTrue(fd is None)
+
+    def test_certificate_source(self):
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open(self.manage_path)
+        self.assertTrue('value="CERT1">CERT1 - Unnamed Certificate</option>'
+            in self.browser.contents)
+        self.certificate.custom_textline_1 = u'Maths, Physics'
+        self.certificate.custom_float_1 = 50.0
+        self.browser.open(self.manage_path)
+        self.assertTrue(
+            'value="CERT1">CERT1 - Unnamed Certificate [Maths, Physics, 50]</option>'
+            in self.browser.contents)
Index: /main/waeup.futminna/trunk/src/waeup/futminna/applicants/utils.py
===================================================================
--- /main/waeup.futminna/trunk/src/waeup/futminna/applicants/utils.py	(revision 10202)
+++ /main/waeup.futminna/trunk/src/waeup/futminna/applicants/utils.py	(revision 10203)
@@ -33,2 +33,17 @@
       'form.student_id': _(u'Process Data'),
       }
+
+    def filterCertificates(self, context, resultset):
+        """Filter and sort certificates in AppCatCertificateSource.
+        """
+        return sorted(resultset, key=lambda value: value.code)
+
+    def getCertTitle(self, context, value):
+        """Compose the titles in AppCatCertificateSource.
+        """
+        if None not in (getattr(value, 'custom_textline_1'),
+            getattr(value, 'custom_float_1')):
+            return "%s - %s [%s, %d]" % (
+                value.code, value.title,
+                value.custom_textline_1, value.custom_float_1)
+        return "%s - %s" % (value.code, value.title)
