Skip to content

3965 back button #4050

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
kcondon merged 5 commits into from
Aug 16, 2017
Merged

3965 back button #4050

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b089600
Fixed back button issue #3965
oscardssmith Aug 8, 2017
1c6ea19
Merge branch 'develop' into 3965-back-button
oscardssmith Aug 8, 2017
7a511b1
JavaScript block added to dataverseuser.xhtml to negate back button i…
bsilverstein95 Aug 11, 2017
efd1a61
Undo some small changes that didn't help
oscardssmith Aug 14, 2017
f58f000
Hide and secure API token from cached version of page #3965
bsilverstein95 Aug 16, 2017
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
30 changes: 24 additions & 6 deletions src/main/webapp/dataverseuser.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,16 @@
<ui:param name="showDataverseHeader" value="false"/>
<ui:param name="loginRedirectPage" value="dataverseuser.xhtml"/>
<ui:define name="body">
<script>
window.onpageshow = function(event) {
if (event.persisted) {
window.location.reload();
}
};
</script>
<f:loadBundle basename="Bundle" var="bundle"/>
<f:metadata>
<f:event type="preRenderView" listener="#{facesContext.externalContext.response.setHeader('Cache-Control', 'no-cache, no-store')}"/>
<f:viewParam name="editMode" value="#{DataverseUserPage.editMode}"/>
<f:viewParam name="redirectPage" value="#{DataverseUserPage.redirectPage}"/>
<f:viewParam name="selectTab" value="#{DataverseUserPage.selectTab}"/>
Expand All @@ -41,7 +49,7 @@
<ul class="dropdown-menu pull-right text-left" role="menu">
<ui:fragment rendered="#{DataverseUserPage.passwordEditable or DataverseUserPage.accountDetailsEditable}">
<li>
<p:commandLink id="editAccount" rendered="#{DataverseUserPage.accountDetailsEditable}"
<p:commandLink id="editAccount" rendered="#{DataverseUserPage.accountDetailsEditable}"
actionListener="#{DataverseUserPage.edit}" update="@form" oncomplete="bind_bsui_components();">
<h:outputText value="#{bundle['account.info']}" />
</p:commandLink>
Expand Down Expand Up @@ -441,11 +449,21 @@
<f:param value="&lt;/a&gt;"/>
</h:outputFormat>
</p>
<div class="highlight">
<div id="apiToken" class="highlight hidden">
<pre>
<code class="language-html" data-lang="html">${ApiTokenPage.apiToken}</code>
</pre>
</div>
<!--Script removes "hidden" class from div containing API token to stop javascript browser exploits-->
<script>
$(document).ready(function() {
$("div#apiToken").removeClass("hidden");
});
//Produces "Are you sure you want to leave this page?" alert to allow API token to hide again
$(window).on("beforeunload", function() {
$("div#apiToken").addClass("hidden");
});
</script>
<div>
<button class="btn btn-default" jsf:action="#{ApiTokenPage.generate()}">
#{ApiTokenPage.checkForApiToken() ? bundle['apitoken.regenerateBtn'] : bundle['apitoken.generateBtn']} </button>
Expand All @@ -461,8 +479,8 @@
<p:tabView id="accountInfoView" rendered="#{!empty DataverseUserPage.editMode}">
<p:tab id="accountInfoEdit" title="#{bundle['account.info']}">
<ui:fragment rendered="#{DataverseUserPage.editMode == 'CREATE' and DataverseUserPage.nonLocalLoginEnabled}">
<p class="help-block"><span class="glyphicon glyphicon-info-sign"/>

<p class="help-block"><span class="glyphicon glyphicon-info-sign"/>
<h:outputText value=" #{bundle['user.signup.otherLogInOptions.tip']}" escape="false"/>
</p>
</ui:fragment>
Expand Down Expand Up @@ -611,10 +629,10 @@
</ui:fragment>
<div class="form-group">
<div class="col-sm-12 button-block">
<p:commandButton id="save" styleClass="btn btn-default" tabindex="9"
<p:commandButton id="save" styleClass="btn btn-default" tabindex="9"
value="#{DataverseUserPage.editMode == 'CREATE' ? bundle['user.createBtn']:bundle.saveChanges}"
action="#{DataverseUserPage.save}" update="@form,:messagePanel,:userDisplayInfoTitle" />
<p:commandButton id="cancel" styleClass="btn btn-default" tabindex="10" value="#{bundle.cancel}"
<p:commandButton id="cancel" styleClass="btn btn-default" tabindex="10" value="#{bundle.cancel}"
action="#{DataverseUserPage.cancel}" process="@this" update="@form">
<p:resetInput target="@form" />
</p:commandButton>
Expand Down