enough for today

materialsproject · Nov 13, 2018 · cb74e58 · cb74e58
1 parent 51a08d7
commit cb74e58
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/mpcontribs/portal/views.py b/mpcontribs/portal/views.py
@@ -13,25 +13,25 @@ def index(request):
         from webtzite.models import RegisteredUser
         user = RegisteredUser.objects.get(username=request.user.username)
         ctx['landing_pages'] = []
-        rester = MPContribsRester(user.api_key, endpoint=get_endpoint(request))
-        for doc in rester.get_landing_pages():
-            explorer = 'mpcontribs_users_{}_explorer_index'.format(doc['project'])
-            entry = {'project': doc['project'], 'url': reverse(explorer)}
-            content = doc['content']
-            entry['title'] = content.get('title', doc['project'])
-            authors = content.get('authors', 'No authors available.').split(',', 1)
-            provenance = '<span class="pull-right" style="font-size: 13px;">{}'.format(authors[0])
-            if len(authors) > 1:
-                provenance += '''<button class="btn btn-sm btn-link" data-html="true"
-                data-toggle="tooltip" data-placement="bottom" data-container="body"
-                title="{}" style="padding: 0px 0px 2px 5px;">et al.</a>'''.format(
-                    authors[1].strip().replace(', ', '<br/>'))
-                provenance += '</span>'
-                entry['provenance'] = provenance
-            ctx['landing_pages'].append(entry) # consider everything in DB released
+        #rester = MPContribsRester(user.api_key, endpoint=get_endpoint(request))
+        #for doc in rester.get_landing_pages():
+        #    explorer = 'mpcontribs_users_{}_explorer_index'.format(doc['project'])
+        #    entry = {'project': doc['project'], 'url': reverse(explorer)}
+        #    content = doc['content']
+        #    entry['title'] = content.get('title', doc['project'])
+        #    authors = content.get('authors', 'No authors available.').split(',', 1)
+        #    provenance = '<span class="pull-right" style="font-size: 13px;">{}'.format(authors[0])
+        #    if len(authors) > 1:
+        #        provenance += '''<button class="btn btn-sm btn-link" data-html="true"
+        #        data-toggle="tooltip" data-placement="bottom" data-container="body"
+        #        title="{}" style="padding: 0px 0px 2px 5px;">et al.</a>'''.format(
+        #            authors[1].strip().replace(', ', '<br/>'))
+        #        provenance += '</span>'
+        #        entry['provenance'] = provenance
+        #    ctx['landing_pages'].append(entry) # consider everything in DB released
     else:
-        ctx.update({'alert': 'Please log in!'})
-        #return redirect('{}?next={}'.format(reverse('cas_ng_login'), reverse('mpcontribs_portal_index')))
+        #ctx.update({'alert': 'Please log in!'})
+        return redirect('{}?next={}'.format(reverse('cas_ng_login'), reverse('mpcontribs_portal_index')))
     return render_to_response("mpcontribs_portal_index.html", ctx)
 
 def groupadd(request, token):

diff --git a/mpcontribs/rest/views.py b/mpcontribs/rest/views.py
@@ -29,8 +29,6 @@ def connect(self, **kwargs):
 def get_endpoint(request):
     from django.core.urlresolvers import reverse
     url = reverse('mpcontribs_rest_index')[:-1]
-    if os.environ.get('DEPLOYMENT') is not None:
-        return 'http://localhost:8080' + url
     if os.environ.get('JPY_USER') is None and in_docker():
         return 'http://app:5000' + url
     return request.build_absolute_uri(url)