dashboard: fix lease permissions

circle/dashboard/templates/dashboard/template-list.html

@@ -26,9 +26,11 @@
   <div class="col-md-6">
   <div class="col-md-6">
     <div class="panel panel-default">
     <div class="panel panel-default">
       <div class="panel-heading">
       <div class="panel-heading">
+        {% if perms.vm.create_leases %}
         <a href="{% url "dashboard.views.lease-create" %}" class="pull-right btn btn-success btn-xs" style="margin-right: 10px;">
         <a href="{% url "dashboard.views.lease-create" %}" class="pull-right btn btn-success btn-xs" style="margin-right: 10px;">
           <i class="icon-plus"></i> {% trans "new lease" %}
           <i class="icon-plus"></i> {% trans "new lease" %}
         </a>
         </a>
+        {% endif %}
         <h3 class="no-margin"><i class="icon-time"></i> {% trans "Leases" %}</h3>
         <h3 class="no-margin"><i class="icon-time"></i> {% trans "Leases" %}</h3>
       </div>
       </div>
       <div class="panel-body">
       <div class="panel-body">

circle/dashboard/views.py

@@ -2285,10 +2285,11 @@ class VmMassDelete(LoginRequiredMixin, View):
             return redirect(next if next else reverse_lazy('dashboard.index'))
             return redirect(next if next else reverse_lazy('dashboard.index'))
 
 
 
 
-class LeaseCreate(LoginRequiredMixin, SuperuserRequiredMixin,
+class LeaseCreate(LoginRequiredMixin, PermissionRequiredMixin,
                   SuccessMessageMixin, CreateView):
                   SuccessMessageMixin, CreateView):
     model = Lease
     model = Lease
     form_class = LeaseForm
     form_class = LeaseForm
+    permission_required = 'vm.create_leases'
     template_name = "dashboard/lease-create.html"
     template_name = "dashboard/lease-create.html"
     success_message = _("Successfully created a new lease.")
     success_message = _("Successfully created a new lease.")
 
 

circle/vm/models/common.py

@@ -97,7 +97,6 @@ class Lease(AclBase):
         ordering = ['name', ]
         ordering = ['name', ]
         permissions = (
         permissions = (
             ('create_leases', _('Can create new leases.')),
             ('create_leases', _('Can create new leases.')),
-            ('bypass_leases', _('Can set arbitrary expiration times.')),
         )
         )
 
 
     @property
     @property