Skip to content

Partial rebase of 4744 Use client-side protocol/host in URL #4792

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 4 commits into from
Aug 26, 2016
Merged

Partial rebase of 4744 Use client-side protocol/host in URL #4792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f27881
Add option to build link-to weburls with client-side javascript
manics Jul 4, 2016
ea0e608
Always use client-side javascript for link-to URL
manics Aug 19, 2016
bbf9887
Use client-side JS for batch-annotate URL
manics Jul 5, 2016
649b33b
Assume webclient_path will always be defined
manics Jul 7, 2016
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
10 changes: 4 additions & 6 deletions ...s/tools/OmeroWeb/omeroweb/webclient/templates/webclient/annotations/includes/toolbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,12 @@
$(this).css('visibility', 'hidden');
}).hide();

{% if link_string %}
$("#link_info_popup_string").val(location.protocol + "//" + location.host + "{{ webclient_path }}?show={{ link_string }}");
{% endif %}

// We do this here and in batch_annotate panel
OME.initToolbarDropdowns();

});

</script>
Expand All @@ -54,11 +56,7 @@
<table>
<tr><td>
<!-- In 'batch_annotate' panel we have 'link_string'. In 'metadata_general' we use js to get value -->
<input type="text" size="30"
{% if link_string %}
value="{{ webclient_path }}?show={{ link_string }}"
{% endif %}
/>
<input type="text" size="30" id="link_info_popup_string" />
</td><td>
<img title="Close" src="{% static 'webgateway/img/close.gif' %}" />
</td></tr>
Expand Down
7 changes: 1 addition & 6 deletions ...s/tools/OmeroWeb/omeroweb/webclient/templates/webclient/annotations/metadata_general.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,7 @@
// show a link to the current object
$("#show_link_btn").click(function(){
$("#link_info_popup").show();
{% if webclient_path %}
var lnk = "{{ webclient_path }}";
{% else %}
var lnk = location.href.substring(0,location.href.length - location.search.length);
if (lnk.charAt( lnk.length-1 ) == "#") { lnk = lnk.substring(0, lnk.length-1)}
{% endif %}
var lnk = location.protocol + "//" + location.host + "{{ webclient_path }}";
var obj_type = "{{manager.obj_type}}";
if (obj_type === "acquisition") {
obj_type = "run";
Expand Down
5 changes: 2 additions & 3 deletions components/tools/OmeroWeb/omeroweb/webclient/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1537,8 +1537,7 @@ def load_metadata_details(request, c_type, c_id, conn=None, share_id=None,

context['figScripts'] = figScripts
context['template'] = template
context['webclient_path'] = request.build_absolute_uri(
reverse('webindex'))
context['webclient_path'] = reverse('webindex')
return context


Expand Down Expand Up @@ -2054,7 +2053,7 @@ def batch_annotate(request, conn=None, **kwargs):
context['differentGroups'] = True # E.g. don't run scripts etc
context['canDownload'] = manager.canDownload(objs)
context['template'] = "webclient/annotations/batch_annotate.html"
context['webclient_path'] = request.build_absolute_uri(reverse('webindex'))
context['webclient_path'] = reverse('webindex')
return context


Expand Down