Changeset 4341

Show
Ignore:
Timestamp:
09/26/08 02:40:07 (2 months ago)
Author:
e2jk
Message:

#3781: Correcting database query that only worked on SQLite

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • ticketmodifiedfilesplugin/0.11/setup.py

    r4058 r4341  
    33setup( 
    44    name='TicketModifiedFiles', 
     5    version='0.10', 
    56    description='Trac plugin that lists the files that have been modified while resolving a ticket.', 
    6     version='0.9', 
    7     license='BSD-ish (see the COPYING.txt file)', 
    87    author='Emilien Klein', 
    98    author_email='Emilien Klein <e2jk AT users DOT sourceforge DOT net>', 
     9    license='BSD-ish (see the COPYING.txt file)', 
    1010    url='http://trac-hacks.org/wiki/TicketModifiedFilesPlugin', 
    1111    packages=['ticketmodifiedfiles'], 
     12    package_data={'ticketmodifiedfiles': ['templates/*.html', 'htdocs/css/*.css', 'htdocs/js/*.js']}, 
     13    install_requires=['Genshi>=0.5'], 
     14    dependency_links=['http://svn.edgewall.org/repos/genshi/trunk#egg=Genshi-dev'], 
    1215    entry_points = {'trac.plugins': ['ticketmodifiedfiles = ticketmodifiedfiles']}, 
    13     package_data={'ticketmodifiedfiles': ['templates/*.html', 'htdocs/css/*.css', 'htdocs/js/*.js']}, 
    14     dependency_links=['http://svn.edgewall.org/repos/genshi/trunk#egg=Genshi-dev'], 
    15     install_requires=['Genshi >= 0.5.dev-r698,==dev'], 
    1616) 

  • ticketmodifiedfilesplugin/0.11/ticketmodifiedfiles/templates/ticketmodifiedfiles.html

    r4058 r4341  
    9898                          <dt class="changeset"> 
    9999                            <a href="${href.changeset(rev)}"> 
    100                                   Changeset 
    101                                   <em>[${rev}]</em> 
    102                                   by 
     100                                  Changeset <em>[${rev}]</em> by 
    103101                                  <span class="author">${author}</span> 
    104                   <span class="time">(${date})</span> 
     102                                 <span class="time">${date}</span> 
    105103                            </a> 
    106104                          </dt> 

  • ticketmodifiedfilesplugin/0.11/ticketmodifiedfiles/ticketmodifiedfiles.py

    r4058 r4341  
    44 
    55import re 
    6 from time import strftime, strptime 
    7  
    8 import genshi.filters 
    96 
    107from trac.core import * 
    …… 
    1310from trac.web.api import IRequestFilter, ITemplateStreamFilter 
    1411from trac.web.chrome import ITemplateProvider, add_stylesheet, add_script 
     12from trac.util.datefmt import format_time 
    1513 
    1614#WARNING: genshi.filters.Transformer requires Genshi 0.5+ 
    …… 
    113111        cursor = db.cursor() 
    114112        #Retrieve all the revisions which's messages contain "#<TICKETID>" 
    115         cursor.execute("SELECT rev, datetime(time, 'unixepoch', 'localtime') as date, author, message FROM revision WHERE message LIKE '%#" + str(id) + "%'") 
    116         for rev, date, author, message, in cursor: 
     113        cursor.execute("SELECT rev, time, author, message FROM revision WHERE message LIKE '%#" + str(id) + "%'") 
     114        for rev, time, author, message, in cursor: 
    117115            #Filter out non-related revisions. 
    118116            #for instance, you are lookink for #19, so you don't want #190, #191, #192, etc. to interfere 
    …… 
    128126                 
    129127            if validrevision: 
    130                 date = strftime("%d/%m/%Y %H:%M", strptime(date, "%Y-%m-%d %H:%M:%S")) 
     128                try: 
     129                    date = "(" + format_time(time, str('%d/%m/%Y - %H:%M')) + ")" 
     130                except: 
     131                    date = "" 
    131132                cursor2 = db.cursor() 
    132133                cursor2.execute("SELECT path FROM node_change WHERE rev=" + rev)