Dockery/Pinry
1
0
Fork 0
mirror of https://github.com/pinry/pinry.git synced 2025-11-14 09:05:41 +01:00
Code Issues Packages Projects Releases Activity

Fix: Fix context name-conflicts for user-page

Browse Source
This commit is contained in:
winkidney
2019-02-21 19:35:23 +08:00
parent 40e2f0b254
commit a5a876b1aa
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/urls.py
View File

@@ -7,7 +7,7 @@ urlpatterns = [
name='pin-form'), name='pin-form'),
url(r'^pins/tags/(?P<tag>(\w|-)+)/$', TemplateView.as_view(template_name='core/pins.html'), url(r'^pins/tags/(?P<tag>(\w|-)+)/$', TemplateView.as_view(template_name='core/pins.html'),
name='tag-pins'), name='tag-pins'),
url(r'^pins/users/(?P<user>(\w|-)+)/$', TemplateView.as_view(template_name='core/pins.html'), url(r'^pins/users/(?P<username>(\w|-)+)/$', TemplateView.as_view(template_name='core/pins.html'),
name='user-pins'), name='user-pins'),
url(r'^(?P<pin>[0-9]+)/$', TemplateView.as_view(template_name='core/pins.html'), url(r'^(?P<pin>[0-9]+)/$', TemplateView.as_view(template_name='core/pins.html'),
name='pin-detail'), name='pin-detail'),

2
pinry/static/js/pin-form.js
View File

@@ -15,7 +15,6 @@ $(window).load(function() {
// Start Helper Functions // Start Helper Functions
function getFormData() { function getFormData() {
return { return {
submitter: currentUser,
url: $('#pin-form-image-url').val(), url: $('#pin-form-image-url').val(),
referer: $('#pin-form-referer').val(), referer: $('#pin-form-referer').val(),
description: $('#pin-form-description').val(), description: $('#pin-form-description').val(),
@@ -25,7 +24,6 @@ $(window).load(function() {
function createPinPreviewFromForm() { function createPinPreviewFromForm() {
var context = {pins: [{ var context = {pins: [{
submitter: currentUser,
image: {thumbnail: {image: $('#pin-form-image-url').val()}}, image: {thumbnail: {image: $('#pin-form-image-url').val()}},
referer: $('#pin-form-referer').val(), referer: $('#pin-form-referer').val(),
description: $('#pin-form-description').val(), description: $('#pin-form-description').val(),

2
pinry/templates/base.html
View File

@@ -36,7 +36,7 @@
}, },
pinFilter = "{{ request.resolver_match.kwargs.pin }}", pinFilter = "{{ request.resolver_match.kwargs.pin }}",
tagFilter = "{{ request.resolver_match.kwargs.tag }}", tagFilter = "{{ request.resolver_match.kwargs.tag }}",
userFilter = "{{ request.resolver_match.kwargs.user }}"; userFilter = "{{ request.resolver_match.kwargs.username }}";
</script> </script>
<!-- End JavaScript Variables --> <!-- End JavaScript Variables -->
</head> </head>