diff options
| author | Aurélien Bompard <aurelien@bompard.org> | 2013-05-18 13:25:49 +0200 |
|---|---|---|
| committer | Aurélien Bompard <aurelien@bompard.org> | 2013-05-18 19:35:36 +0200 |
| commit | 2b0aba327da3f1ca70879b4ab6177ba720f51236 (patch) | |
| tree | 9210c378f67f859a1ebd66b9e93995ded522e3da /hyperkitty | |
| parent | 00e6dd9e20727d13abd0e379e99b9f22855c3d19 (diff) | |
| download | hyperkitty-2b0aba327da3f1ca70879b4ab6177ba720f51236.tar.gz hyperkitty-2b0aba327da3f1ca70879b4ab6177ba720f51236.tar.xz hyperkitty-2b0aba327da3f1ca70879b4ab6177ba720f51236.zip | |
Use the new subject_prefix attribute for stripping
Diffstat (limited to 'hyperkitty')
| -rw-r--r-- | hyperkitty/api.py | 2 | ||||
| -rw-r--r-- | hyperkitty/lib/__init__.py | 5 | ||||
| -rw-r--r-- | hyperkitty/templates/index.html | 8 | ||||
| -rw-r--r-- | hyperkitty/views/pages.py | 3 |
4 files changed, 13 insertions, 5 deletions
diff --git a/hyperkitty/api.py b/hyperkitty/api.py index 1160c3d..f9f2f96 100644 --- a/hyperkitty/api.py +++ b/hyperkitty/api.py @@ -34,7 +34,7 @@ from kittystore.storm.model import Email, Thread class ListSerializer(serializers.Serializer): name = serializers.CharField() display_name = serializers.CharField() - description = serializers.CharField() + subject_prefix = serializers.CharField() class EmailSerializer(serializers.Serializer): list_name = serializers.EmailField() diff --git a/hyperkitty/lib/__init__.py b/hyperkitty/lib/__init__.py index 4acb7d1..ba83513 100644 --- a/hyperkitty/lib/__init__.py +++ b/hyperkitty/lib/__init__.py @@ -76,9 +76,8 @@ def get_store(request): def stripped_subject(mlist, subject): if mlist is None: return subject - list_name = mlist.display_name or mlist.name[:mlist.name.index("@")] - if subject.lower().startswith("[%s] " % list_name.lower()): - subject = subject[len(list_name)+3 : ] + if subject.lower().startswith(mlist.subject_prefix.lower()): + subject = subject[len(mlist.subject_prefix)+1 : ] return subject diff --git a/hyperkitty/templates/index.html b/hyperkitty/templates/index.html index 2efe320..85d051e 100644 --- a/hyperkitty/templates/index.html +++ b/hyperkitty/templates/index.html @@ -17,7 +17,13 @@ {% for mlist in all_lists %} <div class="span3"> <a href="{% url 'list_overview' mlist_fqdn=mlist.name %}" class="mailinglist"> - <p class="list-name">{{ mlist.name }}</p> + <p class="list-name"> + {% if mlist.display_name %} + {{ mlist.display_name }} + {% else %} + {{ mlist.name }} + {% endif %} + </p> <p class="list-address">{{ mlist.name }}</p> <p class="list-description"></p> <img alt="Loading..." class="ajaxloader" src="{{ STATIC_URL }}img/ajax-loader.gif" /> diff --git a/hyperkitty/views/pages.py b/hyperkitty/views/pages.py index 6ec7f7b..7148322 100644 --- a/hyperkitty/views/pages.py +++ b/hyperkitty/views/pages.py @@ -61,5 +61,8 @@ def list_properties(request): "display_name": mm_list.display_name, "description": mm_list.settings["description"], } + # Update KittyStore if necessary + if ml.display_name != mm_list.display_name: + ml.display_name = mm_list.display_name return HttpResponse(json.dumps(props), mimetype='application/javascript') |