Commit1969abb

Gauvain Pocentek

committed

add a Key() method for User objects

1 parente31bb9e commit1969abbCopy full SHA for 1969abb

File tree

+18

-8

lines changed

+18

-8

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,3 +9,4 @@ Contributors`
`9`	`9`	`Daniel Kimsey <dekimsey@ufl.edu>`
`10`	`10`	`Erik Weatherwax <erik.weatherwax@xls.xerox.com>`
`11`	`11`	`Andrew Austin <aaustin@terremark.com>`
	`12`	`+Koen Smets <koen.smets@gmail.com>`

Lines changed: 4 additions & 0 deletions

Lines changed: 13 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -541,14 +541,6 @@ def json(self):`
`541`	`541`	`returnjson.dumps(self.__dict__,cls=jsonEncoder)`
`542`	`542`
`543`	`543`
`544`		`-classUser(GitlabObject):`
`545`		`-_url='/users'`
`546`		`-shortPrintAttr='username'`
`547`		`-requiredCreateAttrs= ['email','password','username','name']`
`548`		`-optionalCreateAttrs= ['skype','linkedin','twitter','projects_limit',`
`549`		`-'extern_uid','provider','bio']`
`550`		`-`
`551`		`-`
`552`	`544`	`classUserKey(GitlabObject):`
`553`	`545`	`_url='/users/%(user_id)s/keys'`
`554`	`546`	`canGet=False`
`@@ -558,6 +550,19 @@ class UserKey(GitlabObject):`
`558`	`550`	`requiredCreateAttrs= ['user_id','title','key']`
`559`	`551`
`560`	`552`
	`553`	`+classUser(GitlabObject):`
	`554`	`+_url='/users'`
	`555`	`+shortPrintAttr='username'`
	`556`	`+requiredCreateAttrs= ['email','password','username','name']`
	`557`	`+optionalCreateAttrs= ['skype','linkedin','twitter','projects_limit',`
	`558`	`+'extern_uid','provider','bio']`
	`559`	`+`
	`560`	`+defKey(self,id=None,**kwargs):`
	`561`	`+returnself._getListOrObject(UserKey,id,`
	`562`	`+user_id=self.id,`
	`563`	`+**kwargs)`
	`564`	`+`
	`565`	`+`
`561`	`566`	`classCurrentUserKey(GitlabObject):`
`562`	`567`	`_url='/user/keys'`
`563`	`568`	`canUpdate=False`

Comments

(0)