Projet

Général

Profil

0001-admin-set-forms-workflows-breadcrumb-in-_q_traverse-.patch

Frédéric Péters, 19 mai 2020 18:10

Télécharger (5,48 ko)

Voir les différences:

Subject: [PATCH] admin: set forms/workflows breadcrumb in _q_traverse (#43080)

 wcs/admin/forms.py          | 14 ++++++--------
 wcs/admin/mail_templates.py |  1 -
 wcs/admin/workflows.py      | 14 ++++++--------
 3 files changed, 12 insertions(+), 17 deletions(-)
wcs/admin/forms.py
24 24

  
25 25
from django.utils.six import BytesIO, StringIO
26 26

  
27
from quixote import get_response, redirect
27
from quixote import get_publisher, get_response, redirect
28 28
from quixote.directory import Directory, AccessControlled
29 29
from quixote.html import TemplateIO, htmltext
30 30

  
......
1479 1479

  
1480 1480

  
1481 1481
class NamedDataSourcesDirectoryInForms(NamedDataSourcesDirectory):
1482
    def _q_traverse(self, path):
1483
        get_response().breadcrumb.append(('forms/', _('Forms')))
1484
        return super(NamedDataSourcesDirectoryInForms, self)._q_traverse(path)
1482
    pass
1485 1483

  
1486 1484

  
1487 1485
class FormsDirectory(AccessControlled, Directory):
......
1512 1510
    def html_top(self, title):
1513 1511
        return html_top('forms', title)
1514 1512

  
1513
    def _q_traverse(self, path):
1514
        get_response().breadcrumb.append(('forms/', _('Forms')))
1515
        return super()._q_traverse(path)
1516

  
1515 1517
    def _q_index(self):
1516
        get_response().breadcrumb.append( ('forms/', _('Forms')) )
1517 1518
        self.html_top(title = _('Forms'))
1518 1519
        r = TemplateIO(html=True)
1519 1520
        get_response().add_javascript(['jquery.js', 'widget_list.js'])
......
1580 1581
        return r.getvalue()
1581 1582

  
1582 1583
    def new(self):
1583
        get_response().breadcrumb.append( ('forms/', _('Forms')) )
1584 1584
        get_response().breadcrumb.append( ('new', _('New')) )
1585 1585
        if Role.count() == 0:
1586 1586
            return template.error_page('forms', _('You first have to define roles.'))
......
1606 1606
        return r.getvalue()
1607 1607

  
1608 1608
    def _q_lookup(self, component):
1609
        get_response().breadcrumb.append( ('forms/', _('Forms')) )
1610 1609
        return self.formdef_page_class(component)
1611 1610

  
1612 1611
    def p_import(self):
......
1627 1626
            except ValueError:
1628 1627
                pass
1629 1628

  
1630
        get_response().breadcrumb.append( ('forms/', _('Forms')) )
1631 1629
        get_response().breadcrumb.append( ('import', _('Import')) )
1632 1630
        self.html_top(title=_(self.import_title))
1633 1631
        r = TemplateIO(html=True)
wcs/admin/mail_templates.py
30 30
    do_not_call_in_templates = True
31 31

  
32 32
    def _q_traverse(self, path):
33
        get_response().breadcrumb.append(('workflows/', _('Workflows')))
34 33
        get_response().breadcrumb.append(('mail-templates/', _('Mail Templates')))
35 34
        return super(MailTemplatesDirectory, self)._q_traverse(path)
36 35

  
wcs/admin/workflows.py
27 27
from django.utils.encoding import force_bytes
28 28
from django.utils.six import StringIO
29 29

  
30
from quixote import redirect, get_publisher
30
from quixote import redirect, get_publisher, get_response
31 31
from quixote.directory import Directory
32 32
from quixote.html import TemplateIO, htmltext
33 33

  
......
1801 1801

  
1802 1802

  
1803 1803
class NamedDataSourcesDirectoryInWorkflows(NamedDataSourcesDirectory):
1804
    def _q_traverse(self, path):
1805
        get_response().breadcrumb.append(('workflows/', _('Workflows')))
1806
        return super(NamedDataSourcesDirectoryInWorkflows, self)._q_traverse(path)
1804
    pass
1807 1805

  
1808 1806

  
1809 1807
class WorkflowsDirectory(Directory):
......
1817 1815
    def html_top(self, title):
1818 1816
        return html_top('workflows', title)
1819 1817

  
1818
    def _q_traverse(self, path):
1819
        get_response().breadcrumb.append(('workflows', _('Workflows')))
1820
        return super()._q_traverse(path)
1821

  
1820 1822
    def _q_index(self):
1821
        get_response().breadcrumb.append( ('workflows/', _('Workflows')) )
1822 1823
        self.html_top(title = _('Workflows'))
1823 1824
        r = TemplateIO(html=True)
1824 1825

  
......
1893 1894
        return r.getvalue()
1894 1895

  
1895 1896
    def new(self):
1896
        get_response().breadcrumb.append( ('workflows/', _('Workflows')) )
1897 1897
        get_response().breadcrumb.append( ('new', _('New')) )
1898 1898
        workflow_ui = WorkflowUI(None)
1899 1899

  
......
1916 1916
        return r.getvalue()
1917 1917

  
1918 1918
    def _q_lookup(self, component):
1919
        get_response().breadcrumb.append( ('workflows/', _('Workflows')) )
1920 1919
        return WorkflowPage(component, html_top=self.html_top)
1921 1920

  
1922 1921
    def p_import(self):
......
1937 1936
            except ValueError:
1938 1937
                pass
1939 1938

  
1940
        get_response().breadcrumb.append( ('workflows/', _('Workflows')) )
1941 1939
        get_response().breadcrumb.append( ('import', _('Import')) )
1942 1940
        self.html_top(title=_('Import Workflow'))
1943 1941
        r = TemplateIO(html=True)
1944
-