Changeset 12809

Timestamp:

21 Mar 2015, 13:31:16 (10 years ago)

Author:

Henrik Bettermann

Message:

Remove ellipses.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba

Files:

• customers/authentication.py (modified) (1 diff)
• customers/browser.py (modified) (2 diffs)
• customers/browser_templates/contractsmanagepage.pt (modified) (1 diff)
• customers/browser_templates/documentsmanagepage.pt (modified) (1 diff)
• customers/browser_templates/paymentspage.pt (modified) (1 diff)
• customers/interfaces.py (modified) (7 diffs)
• customers/tests/test_interfaces.py (modified) (1 diff)
• customers/vocabularies.py (modified) (1 diff)
• payments/browser_templates/containermanagepage.pt (modified) (1 diff)
• payments/browser_templates/containerpage.pt (modified) (1 diff)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/authentication.py

@@ -111 +111 @@
     def checkPassword(self, password):
         """Check whether the given `password` matches the one stored by
-        customers or the temporary password set by officers.
+        customers or the temporary password set by the system.
 
         We additionally check if customer account has been suspended.

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser.py

@@ -820 +820 @@
     @property
     def title(self):
-        return "%s..." % self.context.document_id[:9]
+        return "%s" % self.context.document_id[:9]
 
 
@@ -1180 +1180 @@
     @property
     def title(self):
-        return "%s..." % self.context.contract_id[:9]
+        return "%s" % self.context.contract_id[:9]
 
 

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser_templates/contractsmanagepage.pt

@@ -23 +23 @@
         <td>
           <a tal:attributes="href python: view.url(contract)">
-          <span tal:content="python: contract.contract_id[:9]">CONID</span>...</a>
+            <span tal:content="python: contract.contract_id[:9]">CONID</span>
+          </a>
         </td>
         <td>

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser_templates/documentsmanagepage.pt

@@ -23 +23 @@
         <td>
           <a tal:attributes="href python: view.url(document)">
-          <span tal:content="python: document.document_id[:9]">DOCID</span>...</a>
+            <span tal:content="python: document.document_id[:9]">DOCID</span>
+          </a>
         </td>
         <td>

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser_templates/paymentspage.pt

@@ -15 +15 @@
   <tbody>
     <tr tal:repeat="value view/payments">
-      <td><span tal:content="python: value[0].payment_id[:9]"></span>...</td>
+      <td tal:content="python: value[0].payment_id[:9]">PAYMENT_ID</td>
       <td tal:content="python: layout.formatDatetime(value[0].creation_date)">CREATION DATE</td>
       <td tal:content="python: layout.formatDatetime(value[0].payment_date)">PAYMENT DATE</td>

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/interfaces.py

@@ -143 +143 @@
         title = _(u'Email'),
         required = True,
-        constraint=validate_email,
+        constraint = validate_email,
         source = contextual_email_source,
         )
@@ -214 +214 @@
         title = _(u'Email Address'),
         required = True,
-        constraint=validate_email,
+        constraint = validate_email,
         )
 
@@ -242 +242 @@
         title = _(u'Email'),
         required = True,
-        constraint=validate_email,
+        constraint = validate_email,
         source = contextual_email_source,
         )
@@ -266 +266 @@
         title = _(u'Document Id'),
         required = False,
-        constraint=validate_uuid,
+        constraint = validate_uuid,
         )
 
@@ -321 +321 @@
         title = _(u'Contract Id'),
         required = False,
-        constraint=validate_uuid,
+        constraint = validate_uuid,
         )
 
@@ -333 +333 @@
         title = _(u'Options/Fees'),
         value_type = schema.Choice(
-            source=ProductOptionSourceFactory(),
+            source = ProductOptionSourceFactory(),
             required = True,
             ),
-        constraint=unique_currency,
+        constraint = unique_currency,
         required = False,
         readonly = False,
@@ -392 +392 @@
     product_options = schema.List(
         value_type = ProductOptionField(),
-        constraint=unique_currency,
+        constraint = unique_currency,
         required = False,
         readonly = False,

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_interfaces.py

@@ -134 +134 @@
         source = CustomerDocumentSource()
         result = source.factory.getTitle(object(), self.document)
-        self.assertEqual(result, u'DOC1... - My Sample Document')
+        self.assertEqual(result, u'DOC1 - My Sample Document')
 
     def test_getValues_RefereeSourceFactory(self):

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/vocabularies.py

@@ -195 +195 @@
 
     def getTitle(self, context, value):
-        return "%s... - %s" % (value.document_id[:9], value.title)
+        return "%s - %s" % (value.document_id[:9], value.title)
 
 

main/waeup.ikoba/trunk/src/waeup/ikoba/payments/browser_templates/containermanagepage.pt

@@ -43 +43 @@
             <input type="checkbox" name="entries" tal:attributes="value python:value[0].__name__" />
           </td>
-          <td><span tal:content="python: value[0].payment_id[:9]"></span>...</td>
+          <td tal:content="python: value[0].payment_id[:9]">PAYMENT_ID</td>
           <td tal:content="python: layout.formatDatetime(value[0].creation_date)">CREATION DATE</td>
           <td tal:content="python: layout.formatDatetime(value[0].payment_date)">PAYMENT DATE</td>

main/waeup.ikoba/trunk/src/waeup/ikoba/payments/browser_templates/containerpage.pt

@@ -38 +38 @@
     <tbody>
       <tr tal:repeat="value view/hitlist">
-        <td><span tal:content="python: value[0].payment_id[:9]"></span>...</td>
+        <td tal:content="python: value[0].payment_id[:9]">PAYMENT_ID</td>
         <td tal:content="python: layout.formatDatetime(value[0].creation_date)">CREATION DATE</td>
         <td tal:content="python: layout.formatDatetime(value[0].payment_date)">PAYMENT DATE</td>