Merge pull request #3933 from IQSS/3886-mydata-files

MyData: clicking files facet hangs/gives error
IQSS · Jun 26, 2017 · 4080c04 · 4080c04
2 parents 7f4309b + c7f35ed
commit 4080c04
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/mydata/MyDataFinder.java b/src/main/java/edu/harvard/iq/dataverse/mydata/MyDataFinder.java
@@ -190,7 +190,6 @@ public void runFindDataSteps(MyDataFilterParams filterParams){
             return;
         }
 
-        msgt("runFindDataSteps: " + this.userIdentifier);
         if (!runStep1RoleAssignments()){
             return;
         }
@@ -448,7 +447,7 @@ private boolean runStep1RoleAssignments(){
 
         List<Object[]> results = this.roleAssigneeService.getAssigneeAndRoleIdListFor(filterParams);
 
-        System.out.println("runStep1RoleAssignments results: " + results.toString());
+        //logger.info("runStep1RoleAssignments results: " + results.toString());
 
         if (results == null){
             this.addErrorMessage("Sorry, the EntityManager isn't working (still).");
@@ -642,7 +641,7 @@ private void addErrorMessage(String s){
     }
 
     private void msg(String s){
-        //System.out.println(s);
+        //logger.fine(s);
     }
 
     private void msgt(String s){

diff --git a/src/main/webapp/mydata_templates/cards_minimum.html b/src/main/webapp/mydata_templates/cards_minimum.html
@@ -23,7 +23,7 @@
             <a href="/dataset.xhtml?persistentId={{ card_info.global_id }}"><span style="padding:4px 0;">{{ card_info.name }}</span></a>
  {% elif card_info.type == "file" %}
             <span class="icon-file text-muted pull-right" title="File"></span>
-            <a href="/dataset.xhtml?persistentId={{ card_info.parentIdentifier }}"><span style="padding:4px 0;">{{ card_info.name }}</span></a>
+            <a href="/file.xhtml?fileId={{ card_info.entity_id }}"><span style="padding:4px 0;">{{ card_info.name }}</span></a>
  {% endif %}
         <!-- publication status -->
         {#({{ loop.index }})#} {% if card_info.is_draft_state %}<span class="label label-primary">Draft</span> {% endif %}
@@ -41,7 +41,6 @@
  {% if card_info.type == "dataverse" %}       
         <div class="card-preview-icon-block text-center" style="font-size: 110%;">
             <a href="/dataverse/{{ card_info.identifier }}"><span class="icon-dataverse text-brand"></span></a>
-            {# <a href="/dataverse/{{ card_info.identifier }}"><img src="{{ card_info.image_url | replace("https://RAD-rprasad", "")  }}" alt="icon image" /></a> #}
         </div>
         <span class="text-muted">{{ card_info.date_to_display_on_card }} 
             {% if card_info.parentId %}
@@ -67,15 +66,13 @@
 
  {% elif card_info.type == "file" %}
             <div class="card-preview-icon-block text-center">
-                <a href="/dataset.xhtml?persistentId={{ card_info.parentIdentifier }}">
+                <a href="/file.xhtml?fileId={{ card_info.entity_id }}">
 
-                    <img src="{{ card_info.image_url | replace("https://localhost", "")  }}?pfdrid_c=true" alt="" class="file_card_img" />
-                    <span class="icon-file text-muted" style="display:none;"></span>    
-                    {#{% if card_info.image_url %}
-                        <img src="{{ card_info.image_url | replace("https://localhost", "")  }}?pfdrid_c=true" alt="" />
+                    {% if card_info.image_url %}
+                        <img src="{{ card_info.image_url | replace("https://localhost", "")  }}?pfdrid_c=true" alt="file card" claqss="file_card_img" /> />
                     {% else %}
                         <span class="icon-file text-muted"></span>
-                    {% endif %}#}
+                    {% endif %}
                 </a>
             </div>
             <span class="text-muted">{{ card_info.date_to_display_on_card }}