← Back to branch summary

~ubuntu-branches/ubuntu/vivid/horizon/vivid-proposed

« back to all changes in this revision

Viewing changes to openstack_dashboard/dashboards/project/vpn/tables.py

  • Committer: Package Import Robot
  • Author(s): Corey Bryant, Corey Bryant, James Page
  • Date: 2015-02-16 13:50:29 UTC
  • mfrom: (0.10.1) (1.2.6)
  • Revision ID: package-import@ubuntu.com-20150216135029-m632ppq5etw9te0c
Tags: 1:2015.1~b2-0ubuntu1
[ Corey Bryant ]
* New upstream release.
  - d/control: Align with upstream dependencies.
  - d/p/embedded-xstatic.patch: Refreshed. Code moved to new files.
  - d/p/fix-requirements.patch: Added to drop selenium dependency.

[ James Page ]
* d/bundle-xstatic.sh: Use --system flag when generating xstatic
  assets.

Show diffs side-by-side

added added

removed removed

Lines of Context:
openstack_dashboard/dashboards/project/vpn/tables.py
227
227
        ("Error", False),
228
228
    )
229
229
    id = tables.Column('id', hidden=True)
230
 
    name = tables.Column('name', verbose_name=_('Name'),
 
230
    name = tables.Column('name_or_id', verbose_name=_('Name'),
231
231
                         link="horizon:project:vpn:ipsecsiteconnectiondetails")
232
232
    vpnservice_name = tables.Column('vpnservice_name',
233
233
                                    verbose_name=_('VPN Service'))
241
241
                           status=True,
242
242
                           status_choices=STATUS_CHOICES)
243
243
 
244
 
    class Meta:
 
244
    class Meta(object):
245
245
        name = "ipsecsiteconnectionstable"
246
246
        verbose_name = _("IPSec Site Connections")
247
247
        table_actions = (AddIPSecSiteConnectionLink,
257
257
        ("Error", False),
258
258
    )
259
259
    id = tables.Column('id', hidden=True)
260
 
    name = tables.Column("name", verbose_name=_('Name'),
 
260
    name = tables.Column("name_or_id", verbose_name=_('Name'),
261
261
                         link="horizon:project:vpn:vpnservicedetails")
262
262
    description = tables.Column('description', verbose_name=_('Description'))
263
263
    subnet_name = tables.Column('subnet_name', verbose_name=_('Subnet'))
268
268
                           status=True,
269
269
                           status_choices=STATUS_CHOICES)
270
270
 
271
 
    class Meta:
 
271
    class Meta(object):
272
272
        name = "vpnservicestable"
273
273
        verbose_name = _("VPN Services")
274
274
        table_actions = (AddVPNServiceLink, DeleteVPNServiceLink)
277
277
 
278
278
class IKEPoliciesTable(tables.DataTable):
279
279
    id = tables.Column('id', hidden=True)
280
 
    name = tables.Column("name", verbose_name=_('Name'),
 
280
    name = tables.Column("name_or_id", verbose_name=_('Name'),
281
281
                         link="horizon:project:vpn:ikepolicydetails")
282
282
    auth_algorithm = tables.Column('auth_algorithm',
283
283
                                   verbose_name=_('Authorization algorithm'))
286
286
        verbose_name=_('Encryption algorithm'))
287
287
    pfs = tables.Column("pfs", verbose_name=_('PFS'))
288
288
 
289
 
    class Meta:
 
289
    class Meta(object):
290
290
        name = "ikepoliciestable"
291
291
        verbose_name = _("IKE Policies")
292
292
        table_actions = (AddIKEPolicyLink, DeleteIKEPolicyLink)
295
295
 
296
296
class IPSecPoliciesTable(tables.DataTable):
297
297
    id = tables.Column('id', hidden=True)
298
 
    name = tables.Column("name", verbose_name=_('Name'),
 
298
    name = tables.Column("name_or_id", verbose_name=_('Name'),
299
299
                         link="horizon:project:vpn:ipsecpolicydetails")
300
300
    auth_algorithm = tables.Column('auth_algorithm',
301
301
                                   verbose_name=_('Authorization algorithm'))
304
304
        verbose_name=_('Encryption algorithm'))
305
305
    pfs = tables.Column("pfs", verbose_name=_('PFS'))
306
306
 
307
 
    class Meta:
 
307
    class Meta(object):
308
308
        name = "ipsecpoliciestable"
309
309
        verbose_name = _("IPSec Policies")
310
310
        table_actions = (AddIPSecPolicyLink, DeleteIPSecPolicyLink,)