~rvb/maas/bug-1384001-redux-2

« back to all changes in this revision

Viewing changes to src/maasserver/views.py

  • Committer: Tarmac
  • Author(s): Gavin Panella
  • Date: 2012-03-15 17:10:38 UTC
  • mfrom: (288.2.5 MaaS-to-MAAS)
  • Revision ID: ed@carob-20120315171038-vwgdkkyodun9fqo4
[r=rvb][bug=][author=allenap] MaaS is now known as MAAS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
52
52
    AddArchiveForm,
53
53
    CommissioningForm,
54
54
    EditUserForm,
55
 
    MaaSAndNetworkForm,
 
55
    MAASAndNetworkForm,
56
56
    NewUserCreationForm,
57
57
    ProfileForm,
58
58
    UbuntuForm,
257
257
 
258
258
def settings(request):
259
259
    user_list = UserProfile.objects.all_users().order_by('username')
260
 
    # Process the MaaS & network form.
 
260
    # Process the MAAS & network form.
261
261
    maas_and_network_form, response = process_form(
262
 
        request, MaaSAndNetworkForm, reverse('settings'), 'maas_and_network',
 
262
        request, MAASAndNetworkForm, reverse('settings'), 'maas_and_network',
263
263
        "Configuration updated.")
264
264
    if response is not None:
265
265
        return response