Revision b130ec7c

b/snf-astakos-app/astakos/im/tests/projects.py
151 151
        r = self.user_client.post(post_url, data=application_data, follow=True)
152 152
        app2_id = ProjectApplication.objects.filter().order_by('pk')[1].pk
153 153

  
154

  
154 155
        # no more applications (LIMIT is 2)
155 156
        r = self.user_client.get(reverse('project_add'), follow=True)
156 157
        self.assertRedirects(r, reverse('project_list'))
......
230 231
        newlimit = user_quotas[self.member.uuid]['system'][resource]['limit']
231 232
        # 200 - 100 from project
232 233
        self.assertEqual(newlimit, 100)
234

  
235
        # support email gets rendered in emails content
236
        for mail in get_mailbox('user@synnefo.org'):
237
            self.assertTrue(settings.CONTACT_EMAIL in \
238
                            mail.message().as_string())
b/snf-branding/synnefo_branding/utils.py
1
# Copyright 2013 GRNET S.A. All rights reserved.
2
#
3
# Redistribution and use in source and binary forms, with or
4
# without modification, are permitted provided that the following
5
# conditions are met:
6
#
7
#   1. Redistributions of source code must retain the above
8
#      copyright notice, this list of conditions and the following
9
#      disclaimer.
10
#
11
#   2. Redistributions in binary form must reproduce the above
12
#      copyright notice, this list of conditions and the following
13
#      disclaimer in the documentation and/or other materials
14
#      provided with the distribution.
15
#
16
# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
17
# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
19
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
20
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
21
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
22
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
23
# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
24
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
26
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27
# POSSIBILITY OF SUCH DAMAGE.
28
#
29
# The views and conclusions contained in the software and
30
# documentation are those of the authors and should not be
31
# interpreted as representing official policies, either expressed
32
# or implied, of GRNET S.A.
33

  
34
from django.conf import settings as django_settings
1 35
from synnefo_branding import settings
2 36
from django.template.loader import render_to_string as django_render_to_string
3 37

  
4 38

  
5 39
def get_branding_dict(prepend=None):
6
    dct = {}
40
    # CONTACT_EMAIL may not be a branding setting. We include it here though
41
    # for practial reasons.
42
    dct = {'support': django_settings.CONTACT_EMAIL}
7 43
    for key in dir(settings):
8 44
        if key == key.upper():
9 45
            newkey = key.lower()
......
22 58
def render_to_string(template_name, dictionary=None, context_instance=None):
23 59
    if not dictionary:
24 60
        dictionary = {}
61

  
25 62
    if isinstance(dictionary, dict):
26 63
        newdict = get_branding_dict("BRANDING")
27 64
        newdict.update(dictionary)
28 65
    else:
29 66
        newdict = dictionary
67

  
30 68
    return django_render_to_string(template_name, newdict, context_instance)

Also available in: Unified diff