Skip to content

Update (again) to 5/7 6:33pm to fix 500 error on homepage #9

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 2 commits into from
May 7, 2014
Merged

Update (again) to 5/7 6:33pm to fix 500 error on homepage #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6cae10
Minor layout fix. Changed inline style for padding-top to margin-top.
May 7, 2014
52fb16d
fix for 500 error (moved rendered logic to ui:fragment
scolapasta May 7, 2014
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
2 changes: 1 addition & 1 deletion src/main/webapp/dataverse_header.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:p="http://primefaces.org/ui"
xmlns:pt="http://xmlns.jcp.org/jsf/passthrough"
xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs" style="padding-top:50px;">
xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs" style="margin-top:50px;">

<!-- Navbar Panel -->
<nav id="navbarFixed" class="navbar navbar-default navbar-fixed-top" role="navigation">
Expand Down
23 changes: 12 additions & 11 deletions src/main/webapp/search-include-fragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,25 @@
</h:form>
</ui:fragment>

<ui:fragment>
<h:form id="shareForm" rendered="#{permissionServiceBean.on(DataversePage.dataverse).canIssueCommand('CreateDataverseCommand')
or permissionServiceBean.on(DataversePage.dataverse).canIssueCommand('CreateDatasetCommand') }">
<ui:fragment rendered="#{permissionServiceBean.on(DataversePage.dataverse).canIssueCommand('CreateDataverseCommand')
or permissionServiceBean.on(DataversePage.dataverse).canIssueCommand('CreateDatasetCommand')}">
<h:form id="shareForm">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="glyphicon glyphicon-plus"/> Add Data <span class="caret"></span>
</button>
<ul class="dropdown-menu pull-right text-left" role="menu">
<ui:fragment rendered="#{permissionServiceBean.on(DataversePage.dataverse).canIssueCommand('CreateDataverseCommand')}">
<li><a href="/dataverse.xhtml?ownerId=#{SearchIncludeFragment.dataverse.id}">New Dataverse</a></li>
<li><a href="/dataverse.xhtml?ownerId=#{SearchIncludeFragment.dataverse.id}">New Dataverse</a></li>
</ui:fragment>
<ui:fragment rendered="#{permissionServiceBean.on(DataversePage.dataverse).canIssueCommand('CreateDatasetCommand')}">
<li><a href="/dataset.xhtml?ownerId=#{SearchIncludeFragment.dataverse.id}">New Dataset</a></li>
<li><a href="/dataset.xhtml?ownerId=#{SearchIncludeFragment.dataverse.id}">New Dataset</a></li>
</ui:fragment>
<!--<li><a href="#" style="pointer-events: none; color: grey;">Existing Dataverse</a></li>-->
<!--<li><a href="#" style="pointer-events: none; color: grey;">Existing Dataset</a></li>-->
</ul>
</div>
</h:form>
</ui:fragment>
</p:panelGrid>
</p:panel>
Expand Down Expand Up @@ -442,15 +443,15 @@
<img src="/resources/images/icon_dataverse.png" style="width:48px;" border="0" alt="Dataverse"/>
</h:outputLink>
</div>

<h:outputText value="#{result.dateToDisplayOnCard}" style="color:#999999; margin-right:.5em;"/>

<h:outputLink value="#{dataversePage}?id=#{result.parent.get('id')}" rendered="#{result.parent.id != SearchIncludeFragment.dataverse.id}">
<h:outputText value="#{result.parent.get('name')} Dataverse"/>
</h:outputLink>

<hr style="margin:.5em;border:0;"/>

<h:outputText value="#{Strings:abbreviate(result.descriptionNoSnippet, descriptionAbbreviationThreshold)}" rendered="#{result.descriptionSnippets.size() eq 0}"/>
<ui:fragment rendered="#{result.descriptionSnippets.size() gt 0}">
<ui:repeat value="#{result.descriptionSnippets}" var="snippet" varStatus="varStatus">
Expand Down Expand Up @@ -524,7 +525,7 @@
</div>

<h:outputText value=" #{result.dateToDisplayOnCard}" style="color:#999999; margin-right:.5em;"/>

<h:outputLink value="#{dataversePage}?id=#{result.parent.get('id')}" rendered="#{result.parent.id != SearchIncludeFragment.dataverse.id}">
<h:outputText value="#{result.parent.get('name')} Dataverse"/>
</h:outputLink>
Expand Down Expand Up @@ -580,13 +581,13 @@
<p:graphicImage value="/api/access/preview/#{result.entityId}"/>
</h:outputLink>
</div>

<h:outputText value="#{result.dateToDisplayOnCard}" style="color:#999999; margin-right: .5em;"/>

<h:outputLink value="#{result.fileUrl}">
<h:outputText value="Dataset: #{result.parent.get('name')}"/>
</h:outputLink>

<hr style="margin:.5em;border:0;"/>

<h:outputText value="#{Strings:abbreviate(result.descriptionNoSnippet, descriptionAbbreviationThreshold)}" rendered="#{result.descriptionSnippets.size() eq 0}"/>
Expand Down