do not hardcode extra columns popdown

This commit is contained in:
Frédéric Péters 2014-02-06 10:15:56 +01:00
parent 15a6a1f0be
commit ee11a0f504
2 changed files with 20 additions and 5 deletions

View File

@ -153,6 +153,14 @@ class ResultsTable(BaseTable):
def getExtraColumns(self):
return self.request.get('table-extra-columns', '')
def getPotentialExtraColumns(self):
return [{'id': 'extra.internal_reference_number',
'title': _(u'Internal Number'),},
{'id': 'extra.sender',
'title': _(u'Sender'),},
{'id': 'extra.recipients',
'title': _(u'Recipient(s)'),}]
class ResultsTasksTable(TasksTable):
@ -171,6 +179,9 @@ class ResultsTasksTable(TasksTable):
def getExtraColumns(self):
return self.request.get('table-extra-columns', '')
def getPotentialExtraColumns(self):
return []
class ContactsTasksTable(ResultsTable):
@ -190,6 +201,9 @@ class ContactsTasksTable(ResultsTable):
def getExtraColumns(self):
return self.request.get('table-extra-columns', '')
def getPotentialExtraColumns(self):
return []
class ResultsInformationsTable(InformationsTable):

View File

@ -17,12 +17,13 @@
<input type="hidden" name="table-batchSize" id="table-batchSize"/>
<input type="hidden" name="table-extra-columns" id="table-extra-columns"
tal:attributes="value python:context.table.getExtraColumns()"/>
<div class="actions">
<a href="#" id="extra-columns-menu" class="columns">Colonnes</a>
<div class="actions" tal:define="potential_columns python:context.table.getPotentialExtraColumns()">
<a tal:condition="potential_columns" href="#" id="extra-columns-menu" class="columns">Colonnes</a>
<ul style="display: none;" id="extra-columns">
<li><label><input name="extra-column" type="checkbox" value="extra.internal_reference_number"/>Référence interne</label></li>
<li><label><input name="extra-column" type="checkbox" value="extra.sender"/>Expéditeur</label></li>
<li><label><input name="extra-column" type="checkbox" value="extra.recipients"/>Destinataire(s)</label></li>
<li tal:repeat="potential potential_columns">
<label><input name="extra-column" type="checkbox" tal:attributes="value potential/id"/>
<span tal:replace="potential/title">Référence interne</span></label>
</li>
<li><button>Recharger</button></li>
</ul>
<a href="#" id="batchsize-menu" class="list">Liste</a>