Ignore:
Timestamp:
21 Sep 2012, 08:19:35 (12 years ago)
Author:
uli
Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:
main/waeup.kofa/branches/uli-zc-async
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.kofa/branches/uli-zc-async

  • main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/interfaces.py

    r9209 r9211  
    8080            SimpleTerm(value, value, title) for title, value in terms])
    8181
     82def year_range():
     83    curr_year = datetime.now().year
     84    return range(curr_year - 4, curr_year + 5)
     85
    8286def academic_sessions():
    8387    curr_year = datetime.now().year
    84     year_range = range(1995, curr_year + 2)
     88    year_range = range(curr_year - 10, curr_year + 2)
    8589    return [('%s/%s' % (year,year+1), year) for year in year_range]
    8690
     
    245249        """
    246250
    247     def sendCredentials(user, password, url_info, msg):
     251    def sendCredentials(user, password, login_url, msg):
    248252        """Send credentials as email.
    249253
     
    652656        )
    653657
    654     def getPendingFiles(sort='name'):
     658    def getFiles(sort='name'):
    655659        """Get a list of files stored in `storage` sorted by basename.
    656660        """
    657 
    658     def getFinishedFiles():
    659         """Get a list of files stored in `finished` subfolder of `storage`.
    660         """
    661 
    662661    def setStoragePath(path, move=False, overwrite=False):
    663662        """Set the path where to store files.
Note: See TracChangeset for help on using the changeset viewer.