sp custom version 6.1

JayanthyChengan · Feb 9, 2024 · 99d1efb · 99d1efb
1 parent 17b848c
commit 99d1efb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValueValidator.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValueValidator.java
@@ -18,7 +18,6 @@
 import edu.harvard.iq.dataverse.validation.EMailValidator;
 import edu.harvard.iq.dataverse.validation.URLValidator;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.validator.routines.UrlValidator;
 
 /**
  *

diff --git a/src/main/java/edu/harvard/iq/dataverse/SendFeedbackDialog.java b/src/main/java/edu/harvard/iq/dataverse/SendFeedbackDialog.java
@@ -107,9 +107,15 @@ public void initUserInput(ActionEvent ae) {
         op1 = Long.valueOf(random.nextInt(10));
         op2 = Long.valueOf(random.nextInt(10));
         userSum = null;
-        String systemEmail = settingsService.getValueForKey(SettingsServiceBean.Key.SystemEmail);
-        systemAddress = MailUtil.parseSystemAddress(systemEmail);
 
+        // to be tested JC - old code
+        //String systemEmail = settingsService.getValueForKey(SettingsServiceBean.Key.SystemEmail);
+        //systemAddress = MailUtil.parseSystemAddress(systemEmail);
+
+        String supportEmail = JvmSettings.SUPPORT_EMAIL.lookupOptional().orElse(settingsService.getValueForKey(SettingsServiceBean.Key.SystemEmail));
+        systemAddress = MailUtil.parseSystemAddress(supportEmail);
+
+        // JC old code
         dataverseUserPage.supportMode() ;
     }
 
@@ -227,6 +233,10 @@ public String sendMessage() {
         String supportTeamName = BrandingUtil.getSupportTeamName(systemAddress);
         List<Feedback> feedbacks = FeedbackUtil.gatherFeedback(recipient, dataverseSession, messageAffiliation + " - " + messageSubject  , userMessage, systemAddress, userEmail, systemConfig.getDataverseSiteUrl(), installationBrandName, supportTeamName);
 
+        // to be tested JC - new code
+        //Feedback feedback = FeedbackUtil.gatherFeedback(feedbackTarget, dataverseSession, messageSubject, userMessage, systemAddress, userEmail, systemConfig.getDataverseSiteUrl(), installationBrandName, supportTeamName, ccSupport());
+        //if (feedback==null) {
+
         if (feedbacks.isEmpty()) {
             logger.warning("No feedback has been sent!");
             return null;

diff --git a/...in/java/edu/harvard/iq/dataverse/engine/command/impl/DuraCloudSubmitToArchiveCommand.java b/...in/java/edu/harvard/iq/dataverse/engine/command/impl/DuraCloudSubmitToArchiveCommand.java
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
@@ -1440,7 +1440,7 @@ metrics.dataset.tip.default=Aggregated metrics for this dataset.
 metrics.dataset.makedatacount.title=Make Data Count (MDC) Metrics
 metrics.dataset.makedatacount.since=since
 metrics.dataset.tip.makedatacount=Metrics collected using <a href="https://makedatacount.org/counter-code-of-practice-for-research-data/" target="_blank" rel="noopener"/>Make Data Count</a> standards.
-metrics.dataset.views.tip=Dataset views are combined with both aggregated file views and file downloads.
+metrics.dataset.views.tip=Aggregate of views of the dataset landing page, file views, and file downloads.
 metrics.dataset.downloads.default.tip.replaced=Total aggregated downloads of files in this dataset.
 metrics.dataset.downloads.makedatacount.tip=Each file downloaded is counted as 1, and added to the total download count.
 metrics.dataset.downloads.premakedatacount.tip=Downloads prior to enabling MDC. Counts do not have the same filtering and detail as MDC metrics.

diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
@@ -115,7 +115,7 @@
                                                             <a href="#{systemConfig.guidesBaseUrl}/#{systemConfig.guidesVersion}/user/index.html" title="#{dataverseServiceBean.findRootDataverse().name} #{bundle['header.guides.user']}" target="_blank">#{bundle['header.guides.user']}</a>
                                                         </o:param>
                                                         <o:param>
-                                                            <a href="https://demodv.scholarsportal.info">#{bundle['notification.demoSite']}</a>
+                                                            <a href="https://demo.borealisdata.ca/">#{bundle['notification.demoSite']}</a>
                                                         </o:param>
                                                     </h:outputFormat>
                                                     <!--Only show message about an email confirmation link to non-Shib users (Shib users can't edit their accounts)-->