storing app terms of use in setting table #972

IQSS · Feb 23, 2015 · 44e4661 · 44e4661
1 parent 4b2ca98
commit 44e4661
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/Shib.java b/src/main/java/edu/harvard/iq/dataverse/Shib.java
@@ -291,7 +291,7 @@ public void init() {
          */
         /**
          * @todo Add position and review firstname, lastname
-         */        
+         */
         String affiliation = "FIXME";
         displayInfo = new AuthenticatedUserDisplayInfo(firstNameAttribute, lastNameAttribute, emailAddress, affiliation, null);
 
@@ -574,6 +574,13 @@ public boolean isOfferToConvertExistingAccount() {
         return state.equals(State.PROMPT_TO_CONVERT_EXISTING_ACCOUNT);
     }
 
+//    curl -X PUT -d@/tmp/apptos.txt http://localhost:8080/api/s/settings/:ApplicationTermsOfUse
+    public String getApplicationTermsOfUse() {
+        String saneDefaultForAppTermsOfUse = "There are no Terms of Use for this Dataverse installation.";
+        String appTermsOfUse = settingsService.getValueForKey(SettingsServiceBean.Key.ApplicationTermsOfUse, saneDefaultForAppTermsOfUse);
+        return appTermsOfUse;
+    }
+
     public String getDisplayNameToPersist() {
         return displayNameToPersist;
     }

diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/Setting.java b/src/main/java/edu/harvard/iq/dataverse/settings/Setting.java
@@ -23,8 +23,8 @@ public class Setting implements Serializable {
 
     @Id
     private String name;
-    
-    @Column( length=1024 )
+
+    @Column(columnDefinition = "TEXT")
     private String content;
 
     public Setting() {

diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java
@@ -25,6 +25,8 @@ public class SettingsServiceBean {
      * So there.
      */
     public enum Key {
+        /** Application-wide Terms of Use per installation. */
+        ApplicationTermsOfUse,
         /** Expose debug information in the UI that users shouldn't normally see. */
         Debug,
         /**

diff --git a/src/main/webapp/shib.xhtml b/src/main/webapp/shib.xhtml
@@ -59,8 +59,7 @@
           <!--</div>-->
           <div class="row">
             <textarea class="form-control" rows="4">
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi vitae massa quis libero rhoncus tincidunt. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Nam ut risus dapibus augue pulvinar rutrum quis eu massa. Aliquam accumsan tristique lacinia. Pellentesque malesuada condimentum suscipit. Nullam dapibus scelerisque leo, quis hendrerit ante commodo id. Morbi maximus ex eu tortor accumsan sodales. Sed convallis varius elit, ac egestas leo dapibus id. Ut luctus congue nibh, sit amet vehicula elit pellentesque at.
-
+                <h:outputText value="#{Shib.applicationTermsOfUse}"/>
             </textarea>
             <h:form>
               <div class="checkbox">
@@ -107,7 +106,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi vitae massa quis
               <br/>
               <br/>
               <textarea class="form-control" rows="2">
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi vitae massa quis libero rhoncus tincidunt. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Nam ut risus dapibus augue pulvinar rutrum quis eu massa. Aliquam accumsan tristique lacinia. Pellentesque malesuada condimentum suscipit. Nullam dapibus scelerisque leo, quis hendrerit ante commodo id. Morbi maximus ex eu tortor accumsan sodales. Sed convallis varius elit, ac egestas leo dapibus id. Ut luctus congue nibh, sit amet vehicula elit pellentesque at.
+                <h:outputText value="#{Shib.applicationTermsOfUse}"/>
               </textarea>
               <div class="checkbox">
                 <p:selectBooleanCheckbox required="true" requiredMessage="Please check the box to indicate your acceptance of the Terms of Use">