|
a/Allura/allura/controllers/auth.py |
|
b/Allura/allura/controllers/auth.py |
|
... |
|
... |
| 316 |
topic=mb.topic,
|
316 |
topic=mb.topic,
|
| 317 |
type=mb.type,
|
317 |
type=mb.type,
|
| 318 |
frequency=mb.frequency.unit,
|
318 |
frequency=mb.frequency.unit,
|
| 319 |
artifact=mb.artifact_index_id))
|
319 |
artifact=mb.artifact_index_id))
|
| 320 |
api_token = M.ApiToken.query.get(user_id=c.user._id)
|
320 |
api_token = M.ApiToken.query.get(user_id=c.user._id)
|
|
|
321 |
provider = plugin.AuthenticationProvider.get(request)
|
|
|
322 |
menu = provider.account_navigation()
|
| 321 |
return dict(
|
323 |
return dict(
|
| 322 |
subscriptions=subscriptions,
|
324 |
subscriptions=subscriptions,
|
| 323 |
api_token=api_token,
|
325 |
api_token=api_token,
|
| 324 |
authorized_applications=M.OAuthAccessToken.for_user(c.user))
|
326 |
authorized_applications=M.OAuthAccessToken.for_user(c.user),
|
|
|
327 |
menu=menu)
|
| 325 |
|
328 |
|
| 326 |
@h.vardec
|
329 |
@h.vardec
|
| 327 |
@expose()
|
330 |
@expose()
|
| 328 |
@require_post()
|
331 |
@require_post()
|
| 329 |
def update(self,
|
332 |
def update(self,
|