Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api

This commit is contained in:
Modulos 2017-05-14 03:41:56 +02:00
commit d7bd142387
2 changed files with 3 additions and 2 deletions

View file

@ -4,7 +4,7 @@
<div> <div>
<div class="container dashboard-container"> <div class="container dashboard-container">
<div class="row"> <div class="row">
<div class="col-md-8 col-md-offset-2"> <div class="col-md-8 col-md-offset-2" style="margin-top: 35px;">
<table class="table borderless table-hover"> <table class="table borderless table-hover">
<h3 class="pull-left"><i class="fa fa-server" aria-hidden="true"></i> {% trans "Virtual Machines"%} </h3> <h3 class="pull-left"><i class="fa fa-server" aria-hidden="true"></i> {% trans "Virtual Machines"%} </h3>
<p class="pull-right"> <p class="pull-right">

View file

@ -683,9 +683,10 @@ class VirtualMachineView(LoginRequiredMixin, View):
return HttpResponseRedirect(self.get_success_url()) return HttpResponseRedirect(self.get_success_url())
class HostingBillListView(LoginRequiredMixin, ListView): class HostingBillListView(PermissionRequiredMixin, LoginRequiredMixin, ListView):
template_name = "hosting/bills.html" template_name = "hosting/bills.html"
login_url = reverse_lazy('hosting:login') login_url = reverse_lazy('hosting:login')
permission_required = ['view_hostingview']
context_object_name = "users" context_object_name = "users"
model = StripeCustomer model = StripeCustomer
paginate_by = 10 paginate_by = 10