Revision 43708a0a

b/snf-cyclades-app/synnefo/helpdesk/templates/helpdesk/account.html
39 39
  </ul>
40 40
</div>
41 41
<div class="row-fluid">
42
    {% if error %}
43
        <br />
44
        <div class="alert alert-error ">
45
            <span>{{ error|escape }}</span>
46
        </div>
47
    {% endif %}
42 48
    <div class="object-anchor" id="account"></div>
43 49
    <h3 class="info">{{ account_name }} | {{ account }} | {{ vms|length }} VMs |  {{ networks|length }} Networks</h3>
44 50
    </div>
b/snf-cyclades-app/synnefo/helpdesk/views.py
176 176

  
177 177
    logging.info("Helpdesk search by %s: %s", request.user_uniq, search_query)
178 178
    show_deleted = bool(int(request.GET.get('deleted', SHOW_DELETED_VMS)))
179
    error = request.GET.get('error', None)
179 180

  
180 181
    account_exists = True
181 182
    # flag to indicate successfull astakos calls
......
249 250

  
250 251
    user_context = {
251 252
        'account_exists': account_exists,
253
        'error': error,
252 254
        'is_ip': is_ip,
253 255
        'is_vm': is_vm,
254 256
        'is_uuid': is_uuid,
......
330 332
def vm_shutdown(request, vm_id):
331 333
    logging.info("VM %s shutdown by %s", vm_id, request.user_uniq)
332 334
    vm = VirtualMachine.objects.get(pk=vm_id)
333
    jobId = servers_backend.stop(vm)
334 335
    account = vm.userid
335
    return HttpResponseRedirect(reverse('helpdesk-details', args=(account,)))
336
    error = None
337
    try:
338
        jobId = servers_backend.stop(vm)
339
    except Exception, e:
340
        error = e.message
341

  
342
    redirect = reverse('helpdesk-details', args=(account,))
343
    if error:
344
        redirect = "%s?error=%s" % (redirect, error)
345
    return HttpResponseRedirect(redirect)
336 346

  
337 347

  
338 348
@helpdesk_user_required
......
340 350
def vm_start(request, vm_id):
341 351
    logging.info("VM %s start by %s", vm_id, request.user_uniq)
342 352
    vm = VirtualMachine.objects.get(pk=vm_id)
343
    jobId = servers_backend.start(vm)
344 353
    account = vm.userid
345
    return HttpResponseRedirect(reverse('helpdesk-details', args=(account,)))
354
    error = None
355
    try:
356
        jobId = servers_backend.start(vm)
357
    except Exception, e:
358
        error = e.message
359

  
360
    redirect = reverse('helpdesk-details', args=(account,))
361
    if error:
362
        redirect = "%s?error=%s" % (redirect, error)
363
    return HttpResponseRedirect(redirect)

Also available in: Unified diff