##// END OF EJS Templates
fixes for vcs settings module
marcink -
r1480:daa29da0 beta
parent child Browse files
Show More
@@ -34,7 +34,7 b' from pylons.i18n.translation import _'
34 from pylons.controllers.util import redirect
34 from pylons.controllers.util import redirect
35 from pylons.decorators import jsonify
35 from pylons.decorators import jsonify
36
36
37 from vcs.backends import ARCHIVE_SPECS
37 from vcs.conf import settings
38 from vcs.exceptions import RepositoryError, ChangesetDoesNotExistError, \
38 from vcs.exceptions import RepositoryError, ChangesetDoesNotExistError, \
39 EmptyRepositoryError, ImproperArchiveTypeError, VCSError
39 EmptyRepositoryError, ImproperArchiveTypeError, VCSError
40 from vcs.nodes import FileNode, NodeKind
40 from vcs.nodes import FileNode, NodeKind
@@ -295,7 +295,7 b' class FilesController(BaseRepoController'
295 ext = None
295 ext = None
296 subrepos = request.GET.get('subrepos') == 'true'
296 subrepos = request.GET.get('subrepos') == 'true'
297
297
298 for a_type, ext_data in ARCHIVE_SPECS.items():
298 for a_type, ext_data in settings.ARCHIVE_SPECS.items():
299 archive_spec = fname.split(ext_data[1])
299 archive_spec = fname.split(ext_data[1])
300 if len(archive_spec) == 2 and archive_spec[1] == '':
300 if len(archive_spec) == 2 and archive_spec[1] == '':
301 fileformat = a_type or ext_data[1]
301 fileformat = a_type or ext_data[1]
@@ -308,7 +308,7 b' class FilesController(BaseRepoController'
308 return _('downloads disabled')
308 return _('downloads disabled')
309
309
310 cs = c.rhodecode_repo.get_changeset(revision)
310 cs = c.rhodecode_repo.get_changeset(revision)
311 content_type = ARCHIVE_SPECS[fileformat][0]
311 content_type = settings.ARCHIVE_SPECS[fileformat][0]
312 except ChangesetDoesNotExistError:
312 except ChangesetDoesNotExistError:
313 return _('Unknown revision %s') % revision
313 return _('Unknown revision %s') % revision
314 except EmptyRepositoryError:
314 except EmptyRepositoryError:
General Comments 0
You need to be logged in to leave comments. Login now