From 967697ec2f61ae1a8bb696b2c10f9a6ce50a0f25 Mon Sep 17 00:00:00 2001
From: Gustavo Durand <scolapasta+github@gmail.com>
Date: Mon, 6 Apr 2020 15:43:49 -0400
Subject: [PATCH 1/6] Changed editMode from f:viewParam to o:viewParam

---
 src/main/webapp/template.xhtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml
index a8a6ae2a685..ea29208cd4c 100644
--- a/src/main/webapp/template.xhtml
+++ b/src/main/webapp/template.xhtml
@@ -19,7 +19,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))}"/>
@@ -127,4 +127,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</html>
\ No newline at end of file
+</html>

From 84493e5e076a505529488ac5a864a85c336530be Mon Sep 17 00:00:00 2001
From: Gustavo Durand <scolapasta+github@gmail.com>
Date: Mon, 6 Apr 2020 15:51:54 -0400
Subject: [PATCH 2/6] removed the viewParam for editMode

editMode is set in the init method and is not used as a viewParam
---
 src/main/webapp/guestbook.xhtml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/webapp/guestbook.xhtml b/src/main/webapp/guestbook.xhtml
index 7528e4057c3..e1f2d5beaa6 100644
--- a/src/main/webapp/guestbook.xhtml
+++ b/src/main/webapp/guestbook.xhtml
@@ -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))}"/>
@@ -197,4 +196,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</html>
\ No newline at end of file
+</html>

From a8ded5960a00de47fd435b4425f79b4373a51ae0 Mon Sep 17 00:00:00 2001
From: Gustavo Durand <scolapasta+github@gmail.com>
Date: Mon, 6 Apr 2020 16:29:36 -0400
Subject: [PATCH 3/6] Adding namespaces for omnifaces

---
 src/main/webapp/template.xhtml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml
index ea29208cd4c..a3d97fa0ac0 100644
--- a/src/main/webapp/template.xhtml
+++ b/src/main/webapp/template.xhtml
@@ -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>

From b7b5398bd30cfb6507688bed1bac83746184cfad Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Tue, 7 Apr 2020 09:42:08 -0400
Subject: [PATCH 4/6] #6796 template change all to form

---
 src/main/webapp/template.xhtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml
index a3d97fa0ac0..beecd1c8961 100644
--- a/src/main/webapp/template.xhtml
+++ b/src/main/webapp/template.xhtml
@@ -111,12 +111,12 @@
                     </ui:fragment>
                     <!-- Create/Save Dataset Button Panel -->
                     <div class="button-block" jsf:rendered="#{!empty TemplatePage.editMode}">
-                        <p:commandButton styleClass="btn btn-default" action="#{TemplatePage.save('Terms')}" update="@all"
+                        <p:commandButton styleClass="btn btn-default" action="#{TemplatePage.save('Terms')}" update=":templateForm"
                                          value="#{bundle['dataset.create.add.terms']}"
                                          rendered="#{TemplatePage.editMode == 'CREATE'}">  
                              <f:ajax onerror="window.scrollTo(0, 0)"/>
                         </p:commandButton>
-                        <p:commandButton styleClass="btn btn-default" action="#{TemplatePage.save('')}" update="@all"
+                        <p:commandButton styleClass="btn btn-default" action="#{TemplatePage.save('')}" update=":templateForm"
                                          value="#{TemplatePage.editMode == 'LICENSEADD' ? bundle['dataset.manageTemplates.saveNewTerms'] : bundle.saveChanges}"
                                          rendered="#{TemplatePage.editMode == 'METADATA' or TemplatePage.editMode == 'LICENSE' or TemplatePage.editMode == 'LICENSEADD'}">
                             <f:ajax onerror="window.scrollTo(0, 0)"/>

From 83933ddd07ad3ec08ad43ac47f2818db4e172d38 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Tue, 7 Apr 2020 12:02:02 -0400
Subject: [PATCH 5/6] #6796 add message panel to update

---
 src/main/webapp/template.xhtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml
index beecd1c8961..f8f4ccba390 100644
--- a/src/main/webapp/template.xhtml
+++ b/src/main/webapp/template.xhtml
@@ -111,12 +111,12 @@
                     </ui:fragment>
                     <!-- Create/Save Dataset Button Panel -->
                     <div class="button-block" jsf:rendered="#{!empty TemplatePage.editMode}">
-                        <p:commandButton styleClass="btn btn-default" action="#{TemplatePage.save('Terms')}" update=":templateForm"
+                        <p:commandButton styleClass="btn btn-default" action="#{TemplatePage.save('Terms')}" update=":templateForm,messagePanel"
                                          value="#{bundle['dataset.create.add.terms']}"
                                          rendered="#{TemplatePage.editMode == 'CREATE'}">  
                              <f:ajax onerror="window.scrollTo(0, 0)"/>
                         </p:commandButton>
-                        <p:commandButton styleClass="btn btn-default" action="#{TemplatePage.save('')}" update=":templateForm"
+                        <p:commandButton styleClass="btn btn-default" action="#{TemplatePage.save('')}" update=":templateForm,messagePanel"
                                          value="#{TemplatePage.editMode == 'LICENSEADD' ? bundle['dataset.manageTemplates.saveNewTerms'] : bundle.saveChanges}"
                                          rendered="#{TemplatePage.editMode == 'METADATA' or TemplatePage.editMode == 'LICENSE' or TemplatePage.editMode == 'LICENSEADD'}">
                             <f:ajax onerror="window.scrollTo(0, 0)"/>

From 396e1770b44002f7614d18607ec9e7054da01ea3 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Tue, 7 Apr 2020 14:06:59 -0400
Subject: [PATCH 6/6] #6796 change update to @form

---
 src/main/webapp/template.xhtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml
index f8f4ccba390..bdcf9444c69 100644
--- a/src/main/webapp/template.xhtml
+++ b/src/main/webapp/template.xhtml
@@ -111,12 +111,12 @@
                     </ui:fragment>
                     <!-- Create/Save Dataset Button Panel -->
                     <div class="button-block" jsf:rendered="#{!empty TemplatePage.editMode}">
-                        <p:commandButton styleClass="btn btn-default" action="#{TemplatePage.save('Terms')}" update=":templateForm,messagePanel"
+                        <p:commandButton styleClass="btn btn-default" action="#{TemplatePage.save('Terms')}" update=":@form,messagePanel"
                                          value="#{bundle['dataset.create.add.terms']}"
                                          rendered="#{TemplatePage.editMode == 'CREATE'}">  
                              <f:ajax onerror="window.scrollTo(0, 0)"/>
                         </p:commandButton>
-                        <p:commandButton styleClass="btn btn-default" action="#{TemplatePage.save('')}" update=":templateForm,messagePanel"
+                        <p:commandButton styleClass="btn btn-default" action="#{TemplatePage.save('')}" update="@form,messagePanel"
                                          value="#{TemplatePage.editMode == 'LICENSEADD' ? bundle['dataset.manageTemplates.saveNewTerms'] : bundle.saveChanges}"
                                          rendered="#{TemplatePage.editMode == 'METADATA' or TemplatePage.editMode == 'LICENSE' or TemplatePage.editMode == 'LICENSEADD'}">
                             <f:ajax onerror="window.scrollTo(0, 0)"/>