Changeset 2615

Show
Ignore:
Timestamp:
09/03/07 06:16:10 (1 year ago)
Author:
athomas
Message:

Wiki change comment now returned by wiki.getRecentChanges() and wiki.getPageInfo(). Fixes #1864.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • xmlrpcplugin/trunk/tracrpc/wiki.py

    r2611 r2615  
    5050        yield ('WIKI_VIEW', ((str, str),), self.wikiToHtml) 
    5151 
    52     def _page_info(self, name, time, author, version): 
     52    def _page_info(self, name, time, author, version, comment): 
    5353        return dict(name=name, lastModified=xmlrpclib.DateTime(int(time)), 
    54                     author=author, version=int(version)
     54                    author=author, version=int(version), comment=comment
    5555 
    5656    def getRecentChanges(self, req, since): 
     
    5959        db = self.env.get_db_cnx() 
    6060        cursor = db.cursor() 
    61         cursor.execute('SELECT name, max(time), author, version FROM wiki' 
     61        cursor.execute('SELECT name, max(time), author, version, comment FROM wiki' 
    6262                       ' WHERE time >= %s GROUP BY name ORDER BY max(time) DESC', (since,)) 
    6363        result = [] 
    64         for name, time, author, version in cursor: 
    65             result.append(self._page_info(name, time, author, version)) 
     64        for name, time, author, version, comment in cursor: 
     65            result.append(self._page_info(name, time, author, version, comment)) 
    6666        return result 
    6767 
     
    9696        if page.exists: 
    9797            last_update = page.get_history().next() 
    98             return self._page_info(page.name,  
    99                                    time.mktime(last_update[1].utctimetuple()),  
    100                                    last_update[2], page.version
     98            return self._page_info(page.name, 
     99                                   time.mktime(last_update[1].utctimetuple()), 
     100                                   last_update[2], page.version, page.comment
    101101 
    102102    def putPage(self, req, pagename, content, attributes):