Projet

Général

Profil

0001-misc-use-site-options.cfg-to-enable-global-actions-1.patch

Frédéric Péters, 07 mars 2016 15:28

Télécharger (1,81 ko)

Voir les différences:

Subject: [PATCH] misc: use site-options.cfg to enable global actions (#10224)

 tests/utilities.py     | 1 +
 wcs/admin/workflows.py | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)
tests/utilities.py
98 98
    fd.write('[options]\n')
99 99
    fd.write('formdef-captcha-option = true\n')
100 100
    fd.write('workflow-resubmit-action = true\n')
101
    fd.write('workflow-global-actions = true\n')
101 102
    if sql_mode:
102 103
        fd.write('postgresql = true\n')
103 104
        conn = psycopg2.connect(user=os.environ['USER'])
wcs/admin/workflows.py
1246 1246
                r += htmltext('</ul>')
1247 1247
            r += htmltext('</div>')
1248 1248

  
1249
        if not str(self.workflow.id).startswith('_') or self.workflow.global_actions:
1250
            # TODO: this is currently hidden, it will be enabled in a future
1251
            # release.
1252
            r += htmltext('<div class="bo-block" style="display: none">')
1249
        if not str(self.workflow.id).startswith('_') and get_publisher().has_site_option('workflow-global-actions'):
1250
            r += htmltext('<div class="bo-block">')
1253 1251
            r += htmltext('<h3>%s') % _('Global Actions')
1254 1252
            if not str(self.workflow.id).startswith('_'):
1255 1253
                r += htmltext(' <span class="change">(<a rel="popup" href="global-actions/new">%s</a>)</span>') % _('add global action')
1256
-