Changeset 17846


Ignore:
Timestamp:
Aug 20, 2020, 12:58:12 AM (5 years ago)
Author:
Ryan J Ollos
Message:

0.3: Add Jinja2 template for Trac 1.4+

Fixes #13874.

Location:
exportimportxlsplugin/0.12
Files:
3 added
3 edited

Legend:

Unmodified
Added
Removed

  • exportimportxlsplugin/0.12/importexportxls/admin_ui.py

    r17650 r17846  
    8585        req.perm.require('TICKET_ADMIN')
    8686
     87        has_jinja = hasattr(Chrome, 'jenv')
     88
    8789        template = 'importexport_webadminui.html'
     90        if has_jinja:
     91            template = 'importexport_webadminui_jinja.html'
    8892
    8993        allfields = [ {'name':'id', 'label':'id'} ]
    … …  
    135139            if req.args.get('import_preview'):
    136140                (settings['tickets'], settings['importedFields'], settings['warnings']) = self._get_import_preview(req)
    137                 template = 'importexport_preview.html'
     141                if has_jinja:
     142                    template = 'importexport_preview_jinja.html'
     143                else:
     144                    template = 'importexport_preview.html'
    138145                add_script(req, "importexportxls/importexport_preview.js")
    139146            if req.args.get('import'):
    140147                settings = self._process_import(req)
    141                 template = 'importexport_done.html'
    142 
    143         if template == 'importexport_webadminui.html' and not req.args.get('export'):
     148                if has_jinja:
     149                    template = 'importexport_done_jinja.html'
     150                else:
     151                    template = 'importexport_done.html'
     152
     153        if template.startswith( 'importexport_webadminui' ) and not req.args.get('export'):
    144154            settings['types'] = [m.name for m in model.Type.select(self.env)]
    145155            settings['versions'] = [m.name for m in model.Version.select(self.env)]
    … …  
    151161            settings['resolutions'] = [m.name for m in model.Resolution.select(self.env)]
    152162            settings['fieldsWeight'] = fieldsWeight
     163            if has_jinja:
     164                sortedallfields = sorted(defaultfields + customfields,
     165                                         key=lambda a : fieldsWeight[a['name']])
     166                settings['sortedallfields'] = sortedallfields
    153167        settings['defaultfields'] = defaultfields
    154168        settings['customfields'] = customfields
    … …  
    161175        settings['req'] = req
    162176        if hasattr(Chrome, 'jenv'):
    163             return template, settings, None
     177            if has_jinja:
     178                return template, settings
     179            else:
     180                return template, settings, None
    164181        else:
    165182            return template, settings

  • exportimportxlsplugin/0.12/setup.cfg

    r17649 r17846  
    11[egg_info]
    2 tag_build = dev
     2tag_build =

  • exportimportxlsplugin/0.12/setup.py

    r17649 r17846  
    88      description='Plugin to export and import tickets via XLS',
    99      keywords='ticket excel import export',
    10       version='0.2',
     10      version='0.3',
    1111      url='https://trac-hacks.org/wiki/ExportImportXlsPlugin',
    1212      license='https://www.opensource.org/licenses/mit-license.php',
Note: See TracChangeset for help on using the changeset viewer.