Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'bug-578609-fix_version_format'

  • Loading branch information...
commit 33bd60d9bcdeb7e8b3c0fdf460e56ace3ebe5f44 2 parents 9a8df82 + f2c1ac1
Piotr Zalewa authored July 26, 2010
3  flightdeck/jetpack/models.py
@@ -715,8 +715,7 @@ def export_files_with_dependencies(self, packages_dir):
715 715
 
716 716
 
717 717
 	def get_version_name(self): 
718  
-		name = '%s ' % self.version_name if self.version_name else ''
719  
-		return '%srev. %s' % (name, self.revision_number)
  718
+		return self.version_name if self.version_name else "%s.rev%s" % (self.package.version_name, self.revision_number)
720 719
 
721 720
 class Module(models.Model):
722 721
 	" the only way to 'change' the module is to assign it to different PackageRequest "
2  flightdeck/jetpack/templates/_package_revisions_list.html
@@ -6,7 +6,7 @@
6 6
 			{% for revision in revisions %}
7 7
 				<li>
8 8
 					<em class="date">{{ revision.created_at|date:"Y-m-d" }}</em>
9  
-					<a href="{{ revision.get_absolute_url }}">{{ revision|version_name }}</a>
  9
+					<a href="{{ revision.get_absolute_url }}">{{ revision.get_version_name }}</a>
10 10
 				</li>
11 11
 			{% endfor %}
12 12
 		</ul>

0 notes on commit 33bd60d

Please sign in to comment.
Something went wrong with that request. Please try again.