Merge branch 'master' into feature-refactor-views

Conflicts:
	circle/dashboard/views.py

circle/dashboard/static/dashboard/dashboard.js

@@ -234,6 +234,7 @@ $(function () {
             'host': result[i].host,
             'icon': result[i].icon,
             'status': result[i].status,
+            'owner': result[i].owner,
           });
         }
       });
@@ -251,7 +252,7 @@ $(function () {
     search_result.sort(compareVmByFav);
     for(var i=0; i<5 && i<search_result.length; i++)
       html += generateVmHTML(search_result[i].pk, search_result[i].name, 
-                             search_result[i].host, search_result[i].icon,
+                             search_result[i].owner ? search_result[i].owner : search_result[i].host, search_result[i].icon,
                              search_result[i].status, search_result[i].fav,
                              (search_result.length < 5));
     if(search_result.length == 0)

circle/dashboard/templates/dashboard/index-vm.html

@@ -25,7 +25,10 @@
           <i class="fa {{ i.get_status_icon }}" title="{{ i.get_status_display }}"></i>
           {{ i.name }}
         </span>
-        <small class="text-muted"> {{ i.short_hostname }}</small>
+        <small class="text-muted">
+          {% if i.owner == request.user %}{{ i.short_hostname }}
+          {% else %}{{i.owner.profile.get_display_name}}{% endif %}
+        </small>
         <div class="pull-right dashboard-vm-favourite" data-vm="{{ i.pk }}">
           {% if i.fav %}
             <i class="fa fa-star text-primary title-favourite" title="{% trans "Unfavourite" %}"></i>

circle/dashboard/views/vm.py

@@ -796,6 +796,8 @@ class VmList(LoginRequiredMixin, FilterMixin, ListView):
                 'icon': i.get_status_icon(),
                 'host': i.short_hostname,
                 'status': i.get_status_display(),
+                'owner': (i.owner.profile.get_display_name()
+                          if i.owner != self.request.user else None),
                 'fav': i.pk in favs,
             } for i in instances]
             return HttpResponse(
@@ -1377,6 +1379,7 @@ class TransferOwnershipConfirmView(LoginRequiredMixin, View):
 
         old = instance.owner
         with instance_activity(code_suffix='ownership-transferred',
+                               concurrency_check=False,
                                instance=instance, user=request.user):
             instance.owner = request.user
             instance.clean()