Merge lp:~mdaniel-k/mailmanweb/acceptable_aliases into lp:mailmanweb

[Daniel Mizyrycki]

Properly display acceptable aliases

[Florian Fuchs (flo-fuchs)]

Hi Daniel,

I added your changes to lp:postorius which is the official location now.

Thanks again!
Forian

review: Approve

Unmerged revisions

34. By Daniel Mizyrycki <daniel@seagull> on 2012-03-15

Properly display acceptable aliases.

33. By Daniel Mizyrycki <daniel@seagull> on 2012-03-15

Add dependency.

=== modified file 'setup.py'
--- setup.py	2012-03-12 18:32:09 +0000
+++ setup.py	2012-03-15 22:00:27 +0000
@@ -15,5 +15,6 @@
     url = "https://code.launchpad.net/~flo-fuchs/mailmanwebgsoc2011/transition",
     packages = find_packages('src'),
     package_dir = {'': 'src'},
-    include_package_data = True
+    include_package_data = True,
+    install_requires = ['django-social-auth>=0.6.7']
 )

=== modified file 'src/mailmanweb/views.py'
--- src/mailmanweb/views.py	2012-03-15 20:29:28 +0000
+++ src/mailmanweb/views.py	2012-03-15 22:00:27 +0000
@@ -371,6 +371,9 @@
         for section in form.layout:
             for option in section[1:]:
                 used_settings[option] = the_list.settings[option]
+                # Hack to properly display the aliases
+                if option == u'acceptable_aliases':
+                    used_settings[option] = '\n'.join(used_settings[option])
         #recreate the form using the settings
         form = ListSettings(visible_section,visible_option,data=used_settings)
         form.truncate()