Skip to content
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

6230 gf upgrade part deux #6796

Merged
merged 7 commits into from
Apr 7, 2020
Merged

6230 gf upgrade part deux #6796

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
967697e
Changed editMode from f:viewParam to o:viewParam
scolapasta Apr 6, 2020
84493e5
removed the viewParam for editMode
scolapasta Apr 6, 2020
a8ded59
Adding namespaces for omnifaces
scolapasta Apr 6, 2020
369c763
Merge branch 'develop' into 6230-gf-upgrade-part-deux
sekmiller Apr 7, 2020
b7b5398
#6796 template change all to form
sekmiller Apr 7, 2020
83933dd
#6796 add message panel to update
sekmiller Apr 7, 2020
396e177
#6796 change update to @form
sekmiller Apr 7, 2020
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
3 changes: 1 addition & 2 deletions src/main/webapp/guestbook.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<f:viewParam name="id" value="#{GuestbookPage.guestbookId}"/>
<f:viewParam name="ownerId" value="#{GuestbookPage.ownerId}"/>
<f:viewParam name="sourceId" value="#{GuestbookPage.sourceId}"/>
<f:viewParam name="editMode" value="#{GuestbookPage.editMode}"/>
<f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
<f:viewAction action="#{GuestbookPage.init}" />
<f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(GuestbookPage.dataverse, (GuestbookPage.editMode == 'CREATE' ? bundle['dataset.manageGuestbooks.createBtn'] : GuestbookPage.guestbook.name))}"/>
Expand Down Expand Up @@ -197,4 +196,4 @@
</ui:define>
</ui:composition>
</h:body>
</html>
</html>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird. Couldn't tell what, if anything, changed on this line. Same with the template.xhtml file.

5 changes: 3 additions & 2 deletions src/main/webapp/template.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:p="http://primefaces.org/ui"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:o="http://omnifaces.org/ui"
xmlns:jsf="http://xmlns.jcp.org/jsf">
<h:head>
</h:head>
Expand All @@ -19,7 +20,7 @@
<f:metadata>
<f:viewParam name="id" value="#{TemplatePage.templateId}"/>
<f:viewParam name="ownerId" value="#{TemplatePage.ownerId}"/>
<f:viewParam name="editMode" value="#{TemplatePage.editMode}"/>
<o:viewParam name="editMode" value="#{TemplatePage.editMode}"/>
<f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
<f:viewAction action="#{TemplatePage.init}"/>
<f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(TemplatePage.template.dataverse, (TemplatePage.editMode == 'CREATE' ? bundle['dataset.manageTemplates.createBtn'] : TemplatePage.template.name))}"/>
Expand Down Expand Up @@ -127,4 +128,4 @@
</ui:define>
</ui:composition>
</h:body>
</html>
</html>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as on guestbook.xhtml. What changed?