X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FUpdateAddressType.py;h=2b42ade6ab802cd429a5aa335e8ca88866a84d8b;hb=bd0cbf4f7f2e4cf7ceda500bfa6f98c0a700018b;hp=f8ad7c4b96ebd0deec61a4fb40981a944666b678;hpb=73f8aff35c77b2b8c3c8326a4bf3f7faecde7878;p=plcapi.git

diff --git a/PLC/Methods/UpdateAddressType.py b/PLC/Methods/UpdateAddressType.py
index f8ad7c4..2b42ade 100644
--- a/PLC/Methods/UpdateAddressType.py
+++ b/PLC/Methods/UpdateAddressType.py
@@ -2,7 +2,9 @@ from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.AddressTypes import AddressType, AddressTypes
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
+
+can_update = lambda (field, value): field in ['name', 'description']
 
 class UpdateAddressType(Method):
     """
@@ -14,28 +16,27 @@ class UpdateAddressType(Method):
 
     roles = ['admin']
 
-    can_update = lambda (field, value): field in ['name', 'description']
-    update_fields = dict(filter(can_update, AddressType.fields.items()))
+    address_type_fields = dict(filter(can_update, AddressType.fields.items()))
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(AddressType.fields['address_type_id'],
               AddressType.fields['name']),
-        update_fields
+        address_type_fields
         ]
 
     returns = Parameter(int, '1 if successful')
 
     def call(self, auth, address_type_id_or_name, address_type_fields):
-        if filter(lambda field: field not in self.update_fields, address_type_fields):
-            raise PLCInvalidArgument, "Invalid field specified"
+        address_type_fields = dict(filter(can_update, address_type_fields.items()))
 
-        address_types = AddressTypes(self.api, [address_type_id_or_name]).values()
+        address_types = AddressTypes(self.api, [address_type_id_or_name])
         if not address_types:
             raise PLCInvalidArgument, "No such address type"
         address_type = address_types[0]
 
         address_type.update(address_type_fields)
         address_type.sync()
+        self.event_objects = {'AddressType': [address_type['address_type_id']]}
 
         return 1