kallithea Changeset - 2a8bf2a3da98

Changeset - 2a8bf2a3da98

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 14 years ago 2011-08-26 23:59:12
marcin@python-works.com

fixes #214 added support for downloading subrepos in download menu.

2 files changed with 15 insertions and 10 deletions:

rhodecode/controllers/files.py

rhodecode/templates/summary/summary.html

0 comments (0 inline, 0 general)

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -268,12 +268,13 @@ class FilesController(BaseRepoController @@
                                    'repository.admin')
     def archivefile(self, repo_name, fname):
         fileformat = None
         revision = None
         ext = None
         subrepos = request.GET.get('subrepos') == 'true'
         for a_type, ext_data in ARCHIVE_SPECS.items():
             archive_spec = fname.split(ext_data[1])
             if len(archive_spec) == 2 and archive_spec[1] == '':
                 fileformat = a_type or ext_data[1]
                 revision = archive_spec[0]
@@ @@ -297,13 +298,13 @@ class FilesController(BaseRepoController @@
         response.content_disposition = 'attachment; filename=%s-%s%s' \
             % (repo_name, revision, ext)
         import tempfile
         archive = tempfile.mkstemp()[1]
         t = open(archive, 'wb')
         cs.fill_archive(stream=t, kind=fileformat)
+        cs.fill_archive(stream=t, kind=fileformat, subrepos=subrepos)
         def get_chunked_archive(archive):
             stream = open(archive, 'rb')
             while True:
                 data = stream.read(4096)
                 if not data:

rhodecode/templates/summary/summary.html

➞

Show inline comments

@@ @@ -161,12 +161,15 @@ @@
 			             %endif
 			             <span class="tooltip" title="${_('Download %s as %s') %('tip',archive['type'])}"
 			                  id="${archive['type']+'_link'}">${h.link_to(archive['type'],
 			                h.url('files_archive_home',repo_name=c.dbrepo.repo_name,
 			                fname='tip'+archive['extension']),class_="archive_icon")}</span>
 			        %endfor
                     <span style="vertical-align: bottom">
                         <input id="archive_subrepos" type="checkbox" name="subrepos"/> <span class="tooltip" title="${_('Check this to download archive with subrepos')}" >${_('with subrepos')}</span>
                     </span>
 			    %endif
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
@@ @@ -275,33 +278,34 @@ @@
   			    YUD.setStyle(l[e],'display','');
   			};
   			YUD.setStyle(YUD.get('code_stats_show_more'),
   					'display','none');
   		})
              YUE.on('download_options','change',function(e){
                  var new_cs = e.target.options[e.target.selectedIndex];
                  var tmpl_links = {}
                  %for cnt,archive in enumerate(c.rhodecode_repo._get_archives()):
                 	 tmpl_links['${archive['type']}'] = '${h.link_to(archive['type'],
                         h.url('files_archive_home',repo_name=c.dbrepo.repo_name,
-                        fname='__CS__'+archive['extension']),class_="archive_icon")}';
+                     fname='__CS__'+archive['extension'],subrepos='__SUB__'),class_="archive_icon")}';
                  %endfor
              YUE.on(['download_options','archive_subrepos'],'change',function(e){
             	 var sm = YUD.get('download_options');
                  var new_cs = sm.options[sm.selectedIndex];
                  for(k in tmpl_links){
                 	 var s = YUD.get(k+'_link')
+                	 var s = YUD.get(k+'_link');
                 	 title_tmpl = "${_('Download %s as %s') % ('__CS_NAME__','__CS_EXT__')}";
                 	 s.title = title_tmpl.replace('__CS_NAME__',new_cs.text);
                 	 s.title = s.title.replace('__CS_EXT__',k);
                 	 s.innerHTML = tmpl_links[k].replace('__CS__',new_cs.value);
                 	 var url = tmpl_links[k].replace('__CS__',new_cs.value);
                 	 var subrepos = YUD.get('archive_subrepos').checked
                 	 url = url.replace('__SUB__',subrepos);
                 	 s.innerHTML = url
+                 }
              })
              });
   	</script>
 </div>
 <div class="box box-right"  style="min-height:455px">
     <!-- box / title -->
     <div class="title">

0 comments (0 inline, 0 general)