Skip to content

Social media absolute url config #5245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshmoore merged 1 commit into from
Apr 19, 2017
Merged

Social media absolute url config #5245

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions components/tools/OmeroWeb/omeroweb/webgateway/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
from marshal import imageMarshal, shapeMarshal, rgb_int2rgba
from django.contrib.staticfiles.templatetags.staticfiles import static
from django.views.generic import View
from omeroweb.api.views import build_url
from omeroweb.webadmin.forms import LoginForm
from omeroweb.decorators import get_client_ip
from omeroweb.webadmin.webadmin_utils import upgradeCheck
Expand Down Expand Up @@ -2137,13 +2138,9 @@ def full_viewer(request, iid, conn=None, **kwargs):
if opengraph or twitter:
prefix = kwargs.get(
'thumbprefix', 'webgateway.views.render_thumbnail')

def urlprefix(iid):
return reverse(prefix, args=(iid,))

image_preview = request.build_absolute_uri(urlprefix(iid))
page_url = request.build_absolute_uri(reverse(
'webgateway.views.full_viewer', args=(iid,)))
image_preview = build_url(request, prefix, None, iid)
page_url = build_url(
request, 'webgateway.views.full_viewer', None, iid)

d = {'blitzcon': conn,
'image': image,
Expand Down