Projet

Général

Profil

0001-backoffice-don-t-display-logger-and-bounces-panels-i.patch

Frédéric Péters, 27 avril 2015 14:49

Télécharger (2,79 ko)

Voir les différences: 

Subject: [PATCH] backoffice: don't display logger and bounces panels if
 disabled (#6726)


 wcs/admin/bounces.py       | 3 +++
 wcs/backoffice/root.py     | 6 ++++--
 wcs/qommon/admin/logger.py | 5 ++++-
 3 files changed, 11 insertions(+), 3 deletions(-)
wcs/admin/bounces.py
142 142 
        get_response().breadcrumb.append( ('bounces/', _('Bounces')) )
143 143 
        return Directory._q_traverse(self, path)
144 144 

  		




  
  145
  
    
    def is_visible(self, *args):

  		




  
  146
  
    
        return (get_cfg('emails', {}).get('bounce_handler') == True and Bounce.count() > 0)

  		




  
  147
  
    

  		




  145
  148
  
    
    def _q_index(self):

  		




  146
  149
  
    
        html_top('bounces', title = _('Bounces'))

  		




  147
  150
  
    

  		












  

    
      wcs/backoffice/root.py
    
  





  261
  261
  
    
        ('users/', N_('Users')),

  		




  262
  262
  
    
        ('roles/', N_('Roles')),

  		




  263
  263
  
    
        ('categories/', N_('Categories')),

  		




  264
  
  
    
        ('logger/', N_('Logs')),

  		




  265
  
  
    
        ('bounces/', N_('Bounces')),

  		




  
  264
  
    
        ('logger/', N_('Logs'), logger.is_visible),

  		




  
  265
  
    
        ('bounces/', N_('Bounces'), bounces.is_visible),

  		




  266
  266
  
    
        ('settings/', N_('Settings')),

  		




  267
  267
  
    
        ('/', N_('WCS Form Server'))

  		




  268
  268
  
    
    ]

  		




  ......




  312
  312
  
    
            k, v, display_function = item

  		




  313
  313
  
    
            if not k.strip('/'):

  		




  314
  314
  
    
                continue

  		




  
  315
  
    
            if display_function and not display_function(k):

  		




  
  316
  
    
                continue

  		




  315
  317
  
    
            if k.strip('/') in ('home', 'forms', 'workflows', 'users', 'roles',

  		




  316
  318
  
    
                    'categories', 'settings', 'management'):

  		




  317
  319
  
    
                # menu entries that have icons.

  		












  

    
      wcs/qommon/admin/logger.py
    
  





  21
  21
  
    
from quixote.html import htmltext, TemplateIO

  		




  22
  22
  
    
from quixote.directory import Directory

  		




  23
  23
  
    

  		




  24
  
  
    
from qommon import logger, errors

  		




  
  24
  
    
from qommon import get_cfg, logger, errors

  		




  25
  25
  
    
from qommon.backoffice.menu import html_top

  		




  26
  26
  
    
from qommon.admin.menu import error_page

  		




  27
  27
  
    

  		




  ......




  35
  35
  
    

  		




  36
  36
  
    
    by_user = ByUserDirectory()

  		




  37
  37
  
    

  		




  
  38
  
    
    def is_visible(self, *args):

  		




  
  39
  
    
        return get_cfg('debug', {}).get('logger', False)

  		




  
  40
  
    

  		




  38
  41
  
    
    def _q_index(self):

  		




  39
  42
  
    
        get_response().breadcrumb.append( ('logger/', _('Logs')) )

  		




  40
  43
  
    
        html_top('logger', title = _('Logs'))

  		




  41
  
  
    
-