Skip to content

Commit

Permalink
Update dependency: Django 1.9.7 to 1.11.29 (#445)
Browse files Browse the repository at this point in the history
* Bump django from 1.9.7 to 1.11.29

Bumps [django](https://github.com/django/django) from 1.9.7 to 1.11.29.
- [Release notes](https://github.com/django/django/releases)
- [Commits](django/django@1.9.7...1.11.29)

Signed-off-by: dependabot[bot] <support@github.com>

* Bump django from 1.9.7 to 1.11.29

Bumps [django](https://github.com/django/django) from 1.9.7 to 1.11.29.
- [Release notes](https://github.com/django/django/releases)
- [Commits](django/django@1.9.7...1.11.29)

Signed-off-by: dependabot[bot] <support@github.com>

* Context is now just a dictionary in home/views.py because render() does not work with requestContext types.

* Revert "Context is now just a dictionary in home/views.py because render() does not work with requestContext types."

This reverts commit f8ecf55

* Flattens the RequestContexts before passing as an argument to render(). Also, changed version of Graphspace in setup.py as the newer version has newer dependencies. Previously, with Graphspace 1.2.0 version in setup.py, installing requirements.txt would have a warning.

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
jddanna and dependabot[bot] committed Mar 27, 2021
1 parent cfdd525 commit eadb183
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions applications/graphs/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ def upload_graph_page(request):
except Exception as e:
context['Error'] = str(e)

return render(request, 'upload_graph/index.html', context)
return render(request, 'upload_graph/index.html', context.flatten())
else:
return render(request, 'upload_graph/index.html', context)
return render(request, 'upload_graph/index.html', context.flatten())


def graphs_page(request):
Expand Down Expand Up @@ -60,7 +60,7 @@ def graphs_page(request):
context = RequestContext(request, {
"tags": request.GET.get('tags', '')
})
return render(request, 'graphs/index.html', context)
return render(request, 'graphs/index.html', context.flatten())
else:
raise MethodNotAllowed(request) # Handle other type of request methods like POST, PUT, UPDATE.

Expand Down Expand Up @@ -140,7 +140,7 @@ def graph_page(request, graph_id):
for group in context['groups']:
group['is_shared'] = 1 if group['id'] in shared_group_ids else 0

return render(request, 'graph/index.html', context)
return render(request, 'graph/index.html', context.flatten())


'''
Expand Down
12 changes: 6 additions & 6 deletions applications/home/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def home_page(request):
context = RequestContext(request) # Checkout base.py file to see what context processors are being applied here.

if 'GET' == request.method:
return render(request, 'home/index.html', context) # Handle GET request to index page.
return render(request, 'home/index.html', context.flatten()) # Handle GET request to index page.
else:
raise MethodNotAllowed(request) # Handle other type of request methods like POST, PUT, UPDATE.

Expand Down Expand Up @@ -64,7 +64,7 @@ def features_page(request):
context = RequestContext(request) # Checkout base.py file to see what context processors are being applied here.

if 'GET' == request.method:
return render(request, 'features/index.html', context) # Handle GET request to index page.
return render(request, 'features/index.html', context.flatten()) # Handle GET request to index page.
else:
raise MethodNotAllowed(request) # Handle other type of request methods like POST, PUT, UPDATE.

Expand Down Expand Up @@ -94,7 +94,7 @@ def help_page(request):
context = RequestContext(request) # Checkout base.py file to see what context processors are being applied here.

if 'GET' == request.method:
return render(request, 'help/index.html', context) # Handle GET request to index page.
return render(request, 'help/index.html', context.flatten()) # Handle GET request to index page.
else:
raise MethodNotAllowed(request) # Handle other type of request methods like POST, PUT, UPDATE.

Expand Down Expand Up @@ -124,7 +124,7 @@ def about_us_page(request):
context = RequestContext(request) # Checkout base.py file to see what context processors are being applied here.

if 'GET' == request.method:
return render(request, 'about_us/index.html', context) # Handle GET request to index page.
return render(request, 'about_us/index.html', context.flatten()) # Handle GET request to index page.
else:
raise MethodNotAllowed(request) # Handle other type of request methods like POST, PUT, UPDATE.

Expand Down Expand Up @@ -154,7 +154,7 @@ def forgot_password_page(request):
context = RequestContext(request) # Checkout base.py file to see what context processors are being applied here.

if 'GET' == request.method:
return render(request, 'forgot_password/index.html', context) # Handle GET request to forgot password page.
return render(request, 'forgot_password/index.html', context.flatten()) # Handle GET request to forgot password page.
elif 'POST' == request.method:
email = request.POST.get('forgot_email', None)

Expand Down Expand Up @@ -211,7 +211,7 @@ def reset_password_page(request):
else:
context['error_message'] = "This password reset link is outdated. Please try resetting your password again."

return render(request, 'reset_password/index.html', context) # Handle POST request to forgot password page.
return render(request, 'reset_password/index.html', context.flatten()) # Handle POST request to forgot password page.
else:
raise MethodNotAllowed(request) # Handle other type of request methods like PUT, UPDATE.

Expand Down
8 changes: 4 additions & 4 deletions applications/users/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def groups_page(request):
"""
if 'GET' == request.method:
context = RequestContext(request, {})
return render(request, 'groups/index.html', context)
return render(request, 'groups/index.html', context.flatten())
else:
raise MethodNotAllowed(request) # Handle other type of request methods like POST, PUT, UPDATE.

Expand All @@ -43,7 +43,7 @@ def group_page(request, group_id):
context.push({
"group": _get_group(request, int(group_id)),
})
return render(request, 'group/index.html', context)
return render(request, 'group/index.html', context.flatten())
else:
raise MethodNotAllowed(request) # Handle other type of request methods like POST, PUT, UPDATE.

Expand All @@ -69,7 +69,7 @@ def join_group_page(request, group_id):
"group": group,
"invite_code": request.GET.get('code', None)
})
return render(request, 'join_group/index.html', context)
return render(request, 'join_group/index.html', context.flatten())
else:
try:
users.add_group_member(request, group_id, member_email=request.session['uid'])
Expand Down Expand Up @@ -97,7 +97,7 @@ def join_group_page(request, group_id):
"group": group,
"invite_code": request.POST.get('code', None)
})
return render(request, 'join_group/index.html', context)
return render(request, 'join_group/index.html', context.flatten())
else:
return redirect('/') # TODO: change it to signup page. Currently we dont have a signup link.
else:
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
alabaster==0.7.8
Babel==2.3.4
decorator==4.0.10
Django==1.9.7
Django==1.11.29
django-analytical==2.2.1
django-braces==1.10.0
django-cors-middleware==1.3.1
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

setup(
name = 'GraphSpace Server',
version = '1.2.0',
version = '1.3.0',
url = 'http://graphspace.org',
license = 'GNU GENERAL PUBLIC LICENSE',
author = 'adb',
Expand Down

0 comments on commit eadb183

Please sign in to comment.