← Back to branch summary

~ubuntu-branches/ubuntu/precise/maas/precise

« back to all changes in this revision

Viewing changes to src/maasserver/views.py

  • Committer: Package Import Robot
  • Author(s): Andres Rodriguez
  • Date: 2012-04-04 14:47:13 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20120404144713-nk3xrg5jfa9ahdhh
Tags: 0.1+bzr415+dfsg-0ubuntu1
* debian/control: Update package descriptions; Suggests maas-dhcp for maas
  and add a maas-dhcp binary.
* Add maas-dhcp package to configure a DHCP server.
  - debian/maas-dhcp.config: Add to ask debconf questions about range,
    gateway, and domain.
  - debian/maas-dhcp.postinst: Handle update of config values.
  - debian/maas-dhcp.templates: Debconf questions.
* debian/po: Update for templates.
* Add message telling MAAS URL after installation.
  - debian/maas.templates: Add message.
  - debian/maas.postinst: Display message.
* debian/maas.config: Hide dbconfig-install question.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/views.py
47
47
    login as dj_login,
48
48
    logout as dj_logout,
49
49
    )
 
50
from django.core.exceptions import PermissionDenied
50
51
from django.core.urlresolvers import reverse
51
52
from django.http import (
52
53
    HttpResponse,
77
78
    AddArchiveForm,
78
79
    CommissioningForm,
79
80
    EditUserForm,
80
 
    get_transition_form,
 
81
    get_action_form,
81
82
    MAASAndNetworkForm,
82
83
    NewUserCreationForm,
83
84
    ProfileForm,
90
91
from maasserver.models import (
91
92
    Node,
92
93
    NODE_PERMISSION,
 
94
    NODE_STATUS,
93
95
    SSHKey,
94
96
    UserProfile,
95
97
    )
122
124
        return node
123
125
 
124
126
    def get_form_class(self):
125
 
        return get_transition_form(self.request.user)
 
127
        return get_action_form(self.request.user)
126
128
 
127
129
    def get_context_data(self, **kwargs):
128
130
        context = super(NodeView, self).get_context_data(**kwargs)
169
171
        node = Node.objects.get_node_or_404(
170
172
            system_id=system_id, user=self.request.user,
171
173
            perm=NODE_PERMISSION.ADMIN)
 
174
        if node.status == NODE_STATUS.ALLOCATED:
 
175
            raise PermissionDenied()
172
176
        return node
173
177
 
174
178
    def get_next_url(self):
201
205
    context_object_name = "node_list"
202
206
 
203
207
    def get_queryset(self):
204
 
        return Node.objects.get_visible_nodes(user=self.request.user)
 
208
        return Node.objects.get_nodes(
 
209
            user=self.request.user, perm=NODE_PERMISSION.VIEW)
205
210
 
206
211
    def get_context_data(self, **kwargs):
207
212
        context = super(NodeListView, self).get_context_data(**kwargs)