Merge branch '2606-citation-date' of github.com:IQSS/dataverse into 2…

…606-citation-date
rpartridge · Mar 7, 2016 · 44dd4f6 · 44dd4f6
2 parents 9261239 + a7d1c12
commit 44dd4f6
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 10 deletions.
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
@@ -1,15 +1,15 @@
 # RFI Checklist
 
-Please fill out (1) and (2) **before** submitting the Pull Request
+_**Before** submitting the pull request, fill out sections (1.) Related Issues and (2.) Pull Request Checklist._
 
-### (1) - Related Issues:
+### 1. Related Issues
 
-List/[link](https://guides.github.com/features/issues/#notifications) to the issues in this Pull Request 
+_List and [link](https://guides.github.com/features/issues/#notifications) to the issues in this Pull Request._
 
-\#
+- [#### + Title HERE]
 
-
-### (2) - Pull Request Checklist
+---
+### 2. Pull Request Checklist
 
 - [ ]  Functionality completed as described in FRD
 - [ ]  Dependencies, risks, assumptions in FRD addressed
@@ -19,9 +19,9 @@ List/[link](https://guides.github.com/features/issues/#notifications) to the iss
 - [ ]  All code checkins completed
 
 ---
-### (3) - Review Checklist
+### 3. Review Checklist
 
-_To be filled out **after** the Pull Request is submitted._
+_**After** the pull request has been submitted, fill out this section._
 
 - [ ]  Code review completed or waived
 - [ ]  Testing requirements completed

diff --git a/scripts/database/upgrades/upgrade_v4.2.4_to_4.3.sql b/scripts/database/upgrades/upgrade_v4.2.4_to_4.3.sql
@@ -1,7 +1,36 @@
+/* 
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+/**
+ * Author:  skraffmi
+ * Created: Mar 4, 2016
+ */
+
+alter table
+datasetversion
+drop column availabilitystatus, 
+drop column citationrequirements, 
+drop column conditions, 
+drop column confidentialitydeclaration, 
+drop column contactforaccess, 
+drop column depositorrequirements, 
+drop column disclaimer, 
+drop column fileaccessrequest, 
+drop column license, 
+drop column originalarchive, 
+drop column restrictions, 
+drop column sizeofcollection, 
+drop column specialpermissions, 
+drop column studycompletion, 
+drop column termsofaccess, 
+drop column termsofuse;
+
 -- Add new foreign ket to dataset for citation date (from datasetfieldtype)
 ALTER TABLE dataset ADD COLUMN citationdatedatasetfieldtype_id bigint;
 
 ALTER TABLE dataset
   ADD CONSTRAINT fk_dataset_citationdatedatasetfieldtype_id FOREIGN KEY (citationdatedatasetfieldtype_id)
       REFERENCES datasetfieldtype (id) MATCH SIMPLE
-      ON UPDATE NO ACTION ON DELETE NO ACTION;
+      ON UPDATE NO ACTION ON DELETE NO ACTION;
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
@@ -734,7 +734,7 @@ public String getCitation(boolean isOnlineVersion) {
                     str += ", ";
                 }
                 if (isOnlineVersion) {
-                    str += "<a href=\"" + this.getDataset().getPersistentURL() + "\">" + this.getDataset().getPersistentURL() + "</a>";
+                    str += "<a target=\"_top\" href=\"" + this.getDataset().getPersistentURL() + "\">" + this.getDataset().getPersistentURL() + "</a>";
                 } else {
                     str += this.getDataset().getPersistentURL();
                 }