Merge branch 'bug-578609-fix_version_format'

zalun · Jul 26, 2010 · 33bd60d · 33bd60d
2 parents 9a8df82 + f2c1ac1
commit 33bd60d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/flightdeck/jetpack/models.py b/flightdeck/jetpack/models.py
@@ -715,8 +715,7 @@ def export_files_with_dependencies(self, packages_dir):
 
 
 	def get_version_name(self): 
-		name = '%s ' % self.version_name if self.version_name else ''
-		return '%srev. %s' % (name, self.revision_number)
+		return self.version_name if self.version_name else "%s.rev%s" % (self.package.version_name, self.revision_number)
 
 class Module(models.Model):
 	" the only way to 'change' the module is to assign it to different PackageRequest "

diff --git a/flightdeck/jetpack/templates/_package_revisions_list.html b/flightdeck/jetpack/templates/_package_revisions_list.html
@@ -6,7 +6,7 @@ <h3>{{ package.full_name}} - Revisions</h3>
 			{% for revision in revisions %}
 				<li>
 					<em class="date">{{ revision.created_at|date:"Y-m-d" }}</em>
-					<a href="{{ revision.get_absolute_url }}">{{ revision|version_name }}</a>
+					<a href="{{ revision.get_absolute_url }}">{{ revision.get_version_name }}</a>
 				</li>
 			{% endfor %}
 		</ul>