~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/controllers/changelog_ui.py

  • Committer: Martin Albisetti
  • Date: 2010-01-11 14:17:45 UTC
  • mfrom: (358.2.5 foreign)
  • Revision ID: martin.albisetti@canonical.com-20100111141745-nlvfospyz1iqw9ev
Show svn/git/hg revision ids in loggerhead revision view. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
 
21
21
import urllib
22
22
 
23
 
import simplejson
 
23
try:
 
24
    import simplejson
 
25
except ImportError:
 
26
    import json as simplejson
24
27
 
25
28
from paste.httpexceptions import HTTPServerError
26
29
 
103
106
            'navigation': navigation,
104
107
            'filter_file_id': filter_file_id,
105
108
            'start_revid': start_revid,
106
 
            'viewing_from': (orig_start_revid is not None) and
 
109
            'viewing_from': (orig_start_revid is not None) and 
107
110
                            (orig_start_revid != history.last_revid),
108
111
            'query': query,
109
112
            'search_failed': search_failed,