← Back to branch summary

~mhall119/youoneteeoh/add-requirements-file

« back to all changes in this revision

Viewing changes to shorturl/views.py

  • Committer: john.lenton at canonical
  • Author(s): sil
  • Date: 2011-11-21 14:07:12 UTC
  • mfrom: (7.1.3 u1to)
  • Revision ID: john.lenton@canonical.com-20111121140712-p382m4q3qzqb8c6y
Allow people to upload files to my U1 space.

Show diffs side-by-side

added added

removed removed

Lines of Context:
shorturl/views.py
12
12
from django.template import RequestContext
13
13
from django_oauth_client.decorators import oauth_token_required
14
14
from django_oauth_client.utils import get_client
 
15
from django.conf import settings
15
16
 
16
17
from models import ShortURL
17
18
 
18
19
from . import cb62
19
20
 
 
21
from u1to.utils import u1url
 
22
 
20
23
def dispatch(request, username, idx, extra):
21
24
    try:
22
25
        url = ShortURL.objects.get(user__username=username,
30
33
 
31
34
def _index(request):
32
35
    user = request.user
33
 
    client = get_client(user, 'ubuntuone')
 
36
    client = get_client(user, settings.U1_SERVER)
34
37
    if not user.last_name:
35
 
        response, content = client.request(
36
 
            'https://one.ubuntu.com/api/account/')
 
38
        response, content = client.request(u1url('file_api_base', '/api/account/'))
37
39
        account_info = json.loads(content)
38
40
        user.last_name = account_info['nickname']
39
41
        user.save()
42
44
    files = cache.get(cache_key)
43
45
    if files is None:
44
46
        response, content = client.request(
45
 
         'https://one.ubuntu.com/api/file_storage/v1/public_files')
 
47
         u1url('file_api_base', '/api/file_storage/v1/public_files'))
46
48
        # content = file('fake.json').read()
47
49
        try:
48
50
            files = json.loads(content)
73
75
 
74
76
 
75
77
@login_required
76
 
@oauth_token_required('ubuntuone')
 
78
@oauth_token_required(settings.U1_SERVER)
77
79
@require_http_methods(['GET', 'POST'])
78
80
def index(request):
79
81
    if request.method == 'GET':