Show 'cleaned' URLs for WG email archives (on /wg/acronym/charter/)

 - Legacy-Id: 2069

Author: pasieronen

ietf/idtracker/models.py

@@ -843,7 +843,11 @@ def charter_text(self): # return string containing WG description read from file
 
     def additional_urls(self):
         return AreaWGURL.objects.filter(name=self.group_acronym.acronym)        
-                  
+    def clean_email_archive(self):
+        x = self.email_archive
+        # remove "current/" and "maillist.html"
+        x = re.sub("^(http://www\.ietf\.org/mail-archive/web/)([^/]+/)(current/)?([a-z]+\.html)?$", "\\1\\2", x)
+        return x
     class Meta:
         db_table = 'groups_ietf'
 	ordering = ['?']	# workaround django wanting to sort by acronym but not joining with it

ietf/templates/wginfo/wg_charter.html

@@ -92,7 +92,7 @@
 
 <tr><td>Address:</td><td><a href="mailto:{{ wg.email_address }}">{{ wg.email_address }}</a></td></tr>
 <tr><td>To Subscribe:</td><td><a href="{{ wg.email_subscribe }}">{{ wg.email_subscribe }}</a></td></tr>
-<tr><td>Archive:</td><td><a href="{{ wg.email_archive }}">{{ wg.email_archive }}</a></td></tr> 
+<tr><td>Archive:</td><td><a href="{{ wg.clean_email_archive }}">{{ wg.clean_email_archive }}</a></td></tr> 
 
 <tr>
 <td colspan="2">