Fix template listing for mitaka

circle/dashboard/forms.py

@@ -128,7 +128,7 @@ class VmFromPlainImageForm(forms.Form):
         super(VmFromPlainImageForm, self).__init__(*args, **kwargs)
         super(VmFromPlainImageForm, self).__init__(*args, **kwargs)
 
 
         images = openstack_api.glance.image_list_detailed(request)[0] #TODO: flatten?
         images = openstack_api.glance.image_list_detailed(request)[0] #TODO: flatten?
-        images = [i for i in images if i._apiresource["visibility"] in ["private", "public"]]
+        images = [i for i in images if i._apiresource["visibility"] in ["public",]]
 
 
         def sizeof_fmt(num, suffix='B'):
         def sizeof_fmt(num, suffix='B'):
             for unit in ['', 'K', 'M', 'G', 'T']:
             for unit in ['', 'K', 'M', 'G', 'T']:

circle/dashboard/templates/dashboard/_vm-create-1.html

@@ -79,14 +79,6 @@
       </div>
       </div>
     </div>
     </div>
   </div>
   </div>
-  {% empty %}
-    {% if not template_access_types %}
-      {% trans "You can't start new virtual machines because no templates are shared with you." %}
-    {% else %}
-      {% trans "You can't start new virtual machines because no templates are shared with you however you can request them via the form below." %}
-      <hr />
-      {% include "request/_request-template-form.html" %}
-    {% endif %}
   {% endfor %}
   {% endfor %}
 
 
   <div class="vm-create-template">
   <div class="vm-create-template">

circle/dashboard/views/vm.py

@@ -1173,7 +1173,7 @@ class VmCreate(LoginRequiredMixin, TemplateView):
             if form is None:
             if form is None:
                 form = self.form_class(user=request.user, template=template)
                 form = self.form_class(user=request.user, template=template)
         else:
         else:
-            templates = InstanceTemplate.objects.filter(owner_id=self.request.user.id)
+            templates = InstanceTemplate.objects.filter(owner_id=self.request.user.tenant_id)
 
 
         images = openstack_api.glance.image_list_detailed(request)
         images = openstack_api.glance.image_list_detailed(request)