Revision 7ad07359 snf-cyclades-app/synnefo/helpdesk/views.py
| b/snf-cyclades-app/synnefo/helpdesk/views.py | ||
|---|---|---|
| 54 | 54 |
|
| 55 | 55 |
logger = logging.getLogger(__name__) |
| 56 | 56 |
|
| 57 |
HELPDESK_MEDIA_URL = getattr(settings, 'HELPDESK_MEDIA_URL', |
|
| 58 |
settings.MEDIA_URL + 'helpdesk/') |
|
| 59 |
|
|
| 57 | 60 |
IP_SEARCH_REGEX = re.compile('([0-9]+)(?:\.[0-9]+){3}')
|
| 58 | 61 |
UUID_SEARCH_REGEX = re.compile('([0-9a-z]{8}-([0-9a-z]{4}-){3}[0-9a-z]{12})')
|
| 59 | 62 |
VM_SEARCH_REGEX = re.compile('vm(-){0,}(?P<vmid>[0-9]+)')
|
| ... | ... | |
| 154 | 157 |
search_query=account) |
| 155 | 158 |
|
| 156 | 159 |
# show index template |
| 157 |
return direct_to_template(request, "helpdesk/index.html") |
|
| 160 |
return direct_to_template(request, "helpdesk/index.html", |
|
| 161 |
extra_context={'HELPDESK_MEDIA_URL':
|
|
| 162 |
HELPDESK_MEDIA_URL}) |
|
| 158 | 163 |
|
| 159 | 164 |
|
| 160 | 165 |
@helpdesk_user_required |
| ... | ... | |
| 240 | 245 |
'account_name': account_name, |
| 241 | 246 |
'token': request.user['auth_token'], |
| 242 | 247 |
'networks': networks, |
| 243 |
'UI_MEDIA_URL': settings.UI_MEDIA_URL
|
|
| 248 |
'HELPDESK_MEDIA_URL': HELPDESK_MEDIA_URL
|
|
| 244 | 249 |
} |
| 245 | 250 |
|
| 246 | 251 |
return direct_to_template(request, "helpdesk/account.html", |
Also available in: Unified diff