Update to 5/7, 2:45pm 4:02pm

doc/Sphinx/source/User/dataverse-management.rst

@@ -1,7 +1,7 @@
 Dataverse Management
 ++++++++++++++++++++++++++++
 
-A dataverse is a container for Datasets (research data, code, documentation, and metadata) and other dataverses, 
+A dataverse is a container for datasets (research data, code, documentation, and metadata) and other dataverses, 
 which can be setup for individual researchers, departments, journals and organizations.
 
 |image1|
@@ -17,21 +17,21 @@ Creating a dataverse is easy but first you must be a registered user (see Create
 
 #. Once you are logged in click on the "Add Data" button and in the dropdown menu select "Create Dataverse".
 #. Once on the "New Dataverse" page fill in the following fields:
-    * Enter the name of your Dataverse.
+    * Enter the name of your dataverse.
     * **Host Dataverse**: select which dataverse you would like this new dataverse to belong to. By default it will be a child dataverse of the parent you clicked from.
     * **Alias**: This is an abbreviation, usually lower-case, that becomes part of the URL for the new dataverse. Special characters (~,\`, !, @, #, $, %, ^, &, and \*) and spaces are not allowed. **Note**: if you change the Dataverse Alias field, the URL for your Dataverse changes (http//.../dv/'alias'), which affects links to this page.
-    * **E-mail**: This is the email address you will receive notifications for this particular Dataverse.
+    * **E-mail**: This is the email address you will receive notifications for this particular dataverse.
     * **Affiliation**: Add any Affiliation that can be associated to this particular dataverse (e.g., project name, institute name, department name, journal name, etc).
     * **Description**: Provide a description of this dataverse (max. 1000 characters). This will display on the home page of your dataverse and in the search result list.
-    * **Choose the sets of Metadata Elements for datasets in this Dataverse**: by default the metadata elements will be from the host dataverse that this new dataverse is created in.
+    * **Choose the sets of Metadata Elements for datasets in this dataverse**: by default the metadata elements will be from the host dataverse that this new dataverse is created in.
 3. Click "Create Dataverse" button and you're done! An email will be sent to you with more information, including the URL to access your new dataverse.
 
 \*Required fields are denoted by a red asterisk.
 
 Edit Dataverse 
 =================
 
-To edit your Dataverse, navigate to your Dataverse homepage and select the "Edit Dataverse" button, 
+To edit your dataverse, navigate to your dataverse homepage and select the "Edit Dataverse" button, 
 where you will be presented with the following editing options. 
 
 - **General Information**: edit name, host dataverse, alias, email, 
@@ -45,7 +45,7 @@ Publish Your Dataverse
 =================================================================
 
 Once your dataverse is ready to go public, go to your dataverse page, click on the "Publish" button on the right 
-hand side of the page. A pop-up will appear to confirm that you are ready to actually Publish since once a dataverse
+hand side of the page. A pop-up will appear to confirm that you are ready to actually Publish, since once a dataverse
 is made public it can no longer be unpublished.
 
 

doc/Sphinx/source/User/find-use-data.rst

@@ -43,8 +43,8 @@ To perform an advanced search, click the Advanced Search link next to the search
 *Dataverses:*
 
 - Name - The project, department, university, or professor this Dataverse will contain data for.
-- Affiliation - The organization with which this Dataverse is affiliated.
-- Description - A summary describing the purpose, nature, or scope of this Dataverse.
+- Affiliation - Add any Affiliation that can be associated to this particular dataverse (e.g., project name, institute name, department name, journal name, etc)
+- Description - Provide a description of this dataverse (max. 1000 characters). This will display on the home page of your dataverse and in the search result list.
 
 *Citation Metadata:*
 

doc/Sphinx/source/index.rst

@@ -3,7 +3,7 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Dataverse Guides (Testing for 4.0)
+Dataverse 4.0 Beta Guides
 =======================================================
 
 Contents:

src/main/java/edu/harvard/iq/dataverse/DatasetFieldConstant.java

@@ -30,7 +30,7 @@ public class DatasetFieldConstant implements java.io.Serializable  {
     public final static String series = "series";
     public final static String datasetVersion = "datasetVersion";
 
-    public final static String description = "description";
+    public final static String description = "dsDescription";
     public final static String keyword = "keyword";
     public final static String topicClassification = "topicClassification";
     public final static String geographicBoundingBox = "geographicBoundingBox";

src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java

@@ -24,7 +24,7 @@ public class DataverseHeaderFragment implements java.io.Serializable {
 
     @EJB
     DataverseServiceBean dataverseService;
-    
+
     @Inject
     DataverseSession dataverseSession;
 
@@ -39,6 +39,18 @@ public List<Dataverse> getDataverses(Dataverse dataverse) {
         return dataverses;
     }
 
+    // @todo right now we just check on if published or if you are the creator; need full permission support
+    public boolean hasVisibleChildren(Dataverse dataverse) {
+        for (Dataverse dv : dataverseService.findByOwnerId(dataverse.getId())) {
+            if (dv.isReleased() || dv.getCreator().equals(dataverseSession.getUser())) {
+                return true;
+            }
+        }
+
+        return false;
+
+    }
+
     public TreeNode getDataverseTree(Dataverse dataverse) {
         if (dataverse == null) { // the primefaces component seems to call this with dataverse == null for some reason
             return null;
@@ -47,16 +59,19 @@ public TreeNode getDataverseTree(Dataverse dataverse) {
     }
 
     private TreeNode getDataverseNode(Dataverse dataverse, TreeNode root, boolean expand) {
-        TreeNode dataverseNode = new DefaultTreeNode(dataverse, root);
-        dataverseNode.setExpanded(expand);
-        List<Dataverse> childDataversesOfCurrentDataverse = dataverseService.findByOwnerId(dataverse.getId());
-        for (Dataverse child : childDataversesOfCurrentDataverse) {
-            getDataverseNode(child, dataverseNode, false);
+        // @todo right now we just check on if published or if you are the creator; need full permission support
+        if (dataverse.isReleased() || dataverse.getCreator().equals(dataverseSession.getUser())) {
+            TreeNode dataverseNode = new DefaultTreeNode(dataverse, root);
+            dataverseNode.setExpanded(expand);
+            List<Dataverse> childDataversesOfCurrentDataverse = dataverseService.findByOwnerId(dataverse.getId());
+            for (Dataverse child : childDataversesOfCurrentDataverse) {
+                getDataverseNode(child, dataverseNode, false);
+            }
+            return dataverseNode;
         }
-
-        return dataverseNode;
+        return null;
     }
-    
+
     public String logout() {
         dataverseSession.setUser(null);
         return "/dataverse.xhtml?faces-redirect=true";

src/main/webapp/dataset.xhtml

@@ -126,16 +126,15 @@
                                         <p:confirmDialog message="This dataset may not be published because its host dataverse has not been published." header="May not publish" widgetVar="mayNotRelease">
                                         </p:confirmDialog>
                                     </ui:fragment>
-                                    <ui:fragment rendered="#{DatasetPage.displayVersion != DatasetPage.dataset.latestVersion 
-                                                       and permissionServiceBean.on(DatasetPage.dataset).canIssueCommand('ReleaseDatasetCommand')}">
+                                    <ui:fragment rendered="#{DatasetPage.dataset.latestVersion.draft and DatasetPage.displayVersion != DatasetPage.dataset.latestVersion
+                                                       and permissionServiceBean.on(DatasetPage.dataset).canIssueCommand('UpdateDatasetCommand')}">
                                         <div style="float:right; margin-left:1em;">
                                             <h:outputLink styleClass="btn btn-warning" value="/dataset.xhtml?id=#{DatasetPage.dataset.id}&#38;versionId=#{DatasetPage.dataset.latestVersion.id}">
                                                 <h:outputText value="View Unpublished Version"/>
                                             </h:outputLink>
                                         </div>
                                     </ui:fragment>
-                                    <ui:fragment rendered="#{DatasetPage.dataset.released and DatasetPage.displayVersion.draft 
-                                                       and permissionServiceBean.on(DatasetPage.dataset).canIssueCommand('ReleaseDatasetCommand')}">
+                                    <ui:fragment rendered="#{DatasetPage.dataset.released and DatasetPage.displayVersion != DatasetPage.dataset.releasedVersion}">
                                         <div style="float:right; margin-left:1em;">
                                             <h:outputLink styleClass="btn btn-primary" value="/dataset.xhtml?id=#{DatasetPage.dataset.id}">
                                                 <h:outputText value="View Published Version"/>
@@ -156,6 +155,7 @@
                                     <ui:fragment rendered="#{!empty DatasetPage.datasetVersionUI.title.value}">
                                         <span id="title">#{DatasetPage.datasetVersionUI.title.value}</span>
                                         <h:outputText value="Draft" styleClass="label label-warning" style="margin-left:1em;vertical-align:text-top;" rendered="#{DatasetPage.displayVersion.draft}"/>
+                                        <h:outputText value="Unpublished" styleClass="label label-danger" style="margin-left:1em;vertical-align:text-top;" rendered="#{!DatasetPage.dataset.released}"/>
                                     </ui:fragment>
                                     <ui:fragment rendered="#{!empty DatasetPage.displayCitation}">
                                         <div id="citation">

src/main/webapp/dataverse_header.xhtml

@@ -159,21 +159,21 @@
             <ui:repeat value="#{dataverseHeaderFragment.getDataverses(dataverse)}" var="dv" varStatus="status">
                 <h:outputText value=" > " styleClass="breadcrumbCarrot" rendered="#{!status.first}"/>
                 <div class="breadcrumbBlock">
-                    <div class="dropdown #{!empty dataverseServiceBean.findByOwnerId(dv.getId()) ? 'dropdown-toggle keep-on' : ''}" data-delay="#{!empty dataverseServiceBean.findByOwnerId(dv.getId()) ? '800' : ''}" data-hover="#{!empty dataverseServiceBean.findByOwnerId(dv.getId()) ? 'dropdown' : ''}" data-target="#{!empty dataverseServiceBean.findByOwnerId(dv.getId()) ? '#' : ''}" data-close-others="#{!empty dataverseServiceBean.findByOwnerId(dv.getId()) ? 'true' : ''}">
+                    <div class="dropdown #{dataverseHeaderFragment.hasVisibleChildren(dv) ? 'dropdown-toggle keep-on' : ''}" data-delay="#{dataverseHeaderFragment.hasVisibleChildren(dv) ? '800' : ''}" data-hover="#{dataverseHeaderFragment.hasVisibleChildren(dv) ? 'dropdown' : ''}" data-target="#{dataverseHeaderFragment.hasVisibleChildren(dv) ? '#' : ''}" data-close-others="#{dataverseHeaderFragment.hasVisibleChildren(dv) ? 'true' : ''}">
                         <h:outputText value="#{dv.name} Dataverse" styleClass="#{dataverse.id == dv.id ? 'breadcrumbActive' : ''}" rendered="#{dataverse.id == dv.id and dataset == null}"/>
                         <ui:fragment rendered="#{dataverse.id != dv.id or dataset != null}" >
                             <a id="breadcrumbLnk#{status.index}" href="/dataverse.xhtml?id=#{dv.id}">
                                 <h:outputText value="#{dv.name} Dataverse"/>
                             </a>
                         </ui:fragment>
 
-                        <ui:fragment rendered="#{!empty dataverseServiceBean.findByOwnerId(dv.getId())}">
+                        <ui:fragment rendered="#{dataverseHeaderFragment.hasVisibleChildren(dv)}">
                             <a id="breadcrumbLnkTree#{status.index}" title="Browse #{dv.name} Dataverse" styleClass="#{dataverse.id == dv.id ? 'breadcrumbActive' : ''}" role="button">
                                 <span class="glyphicon glyphicon-chevron-down"></span>
                             </a>
                         </ui:fragment>
                     </div>
-                    <div class="dropdown-menu" role="menu" aria-labelledby="breadcrumbLnk#{status.index}" rendered="#{!empty dataverseServiceBean.findByOwnerId(dv.getId())}">
+                    <div class="dropdown-menu" role="menu" aria-labelledby="breadcrumbLnk#{status.index}" rendered="#{dataverseHeaderFragment.hasVisibleChildren(dv)}">
                         <p:tree value="#{dataverseHeaderFragment.getDataverseTree(dv)}" var="node"  cache="true" id="tree">
                             <p:treeNode>
                                 <h:outputText value="#{node.name} Dataverse" styleClass="breadcrumbActive" rendered="#{dataverse.id == node.id and dataset == null}"/>