From 6ffd791f120493d8e5839f1cae168d1571046c20 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Fri, 6 Sep 2019 11:35:20 +0200
Subject: [PATCH] 64574: Further mantis template fixes

---
 .../publication/publication.component.html    |  2 +-
 .../journal-issue.component.html              |  2 +-
 .../journal-volume.component.html             |  2 +-
 .../item-pages/journal/journal.component.html |  2 +-
 .../item-pages/orgunit/orgunit.component.html |  4 ++--
 .../item-pages/person/person.component.html   | 10 ++++++++-
 .../item-pages/project/project.component.html | 22 +++++++++----------
 7 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/themes/mantis/app/+item-page/simple/item-types/publication/publication.component.html b/themes/mantis/app/+item-page/simple/item-types/publication/publication.component.html
index de74a75d2b..b7e2dbad39 100644
--- a/themes/mantis/app/+item-page/simple/item-types/publication/publication.component.html
+++ b/themes/mantis/app/+item-page/simple/item-types/publication/publication.component.html
@@ -4,7 +4,7 @@
 
             <div class="col-12 col-md-2 d-flex flex-md-column justify-content-between">
                 <ds-metadata-field-wrapper>
-                    <ds-thumbnail [thumbnail]="this.item.getThumbnail() | async"></ds-thumbnail>
+                    <ds-thumbnail [thumbnail]="item.getThumbnail() | async"></ds-thumbnail>
                 </ds-metadata-field-wrapper>
                 <div>
                     <a class="btn btn-secondary"
diff --git a/themes/mantis/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/themes/mantis/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
index b34be8aec2..03f5e35335 100644
--- a/themes/mantis/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
+++ b/themes/mantis/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
@@ -4,7 +4,7 @@
 
             <div class="col-12 col-md-2 d-flex flex-md-column justify-content-between">
                 <ds-metadata-field-wrapper>
-                    <ds-thumbnail [thumbnail]="this.item.getThumbnail() | async"></ds-thumbnail>
+                    <ds-thumbnail [thumbnail]="item.getThumbnail() | async"></ds-thumbnail>
                 </ds-metadata-field-wrapper>
                 <div>
                     <a class="btn btn-secondary"
diff --git a/themes/mantis/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/themes/mantis/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
index 99651377cb..19950818a1 100644
--- a/themes/mantis/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
+++ b/themes/mantis/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
@@ -4,7 +4,7 @@
 
             <div class="col-12 col-md-2 d-flex flex-md-column justify-content-between">
                 <ds-metadata-field-wrapper>
-                    <ds-thumbnail [thumbnail]="this.item.getThumbnail() | async"></ds-thumbnail>
+                    <ds-thumbnail [thumbnail]="item.getThumbnail() | async"></ds-thumbnail>
                 </ds-metadata-field-wrapper>
                 <div>
                     <a class="btn btn-secondary"
diff --git a/themes/mantis/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/themes/mantis/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
index ecc36c53bc..41d7b96c1d 100644
--- a/themes/mantis/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
+++ b/themes/mantis/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
@@ -3,7 +3,7 @@
         <div class="row">
             <div class="col-12 col-md-2 d-flex flex-md-column justify-content-between">
                 <ds-metadata-field-wrapper>
-                    <ds-thumbnail [thumbnail]="this.item.getThumbnail() | async"></ds-thumbnail>
+                    <ds-thumbnail [thumbnail]="item.getThumbnail() | async"></ds-thumbnail>
                 </ds-metadata-field-wrapper>
                 <div>
                     <a class="btn btn-secondary"
diff --git a/themes/mantis/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.html b/themes/mantis/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.html
index d5db61b7a1..aa6aa695b4 100644
--- a/themes/mantis/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.html
+++ b/themes/mantis/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.html
@@ -4,7 +4,7 @@
 
             <div class="col-12 col-md-2 d-flex flex-md-column justify-content-between">
                 <ds-metadata-field-wrapper>
-                    <ds-thumbnail [thumbnail]="this.item.getThumbnail() | async"
+                    <ds-thumbnail [thumbnail]="item.getThumbnail() | async"
                                   [defaultImage]="'assets/images/orgunit-placeholder.svg'"></ds-thumbnail>
                 </ds-metadata-field-wrapper>
                 <div>
@@ -18,7 +18,7 @@
                 <h2 class="item-page-title-field">
                   {{'orgunit.page.titleprefix' | translate}}
                     <ds-metadata-values
-                            [mdValues]="item?.allMetadata(['orgunit.identifier.name'])"></ds-metadata-values>
+                            [mdValues]="item?.allMetadata(['organization.legalName'])"></ds-metadata-values>
                 </h2>
                 <div class="row">
                     <div class="col-12 col-md-6">
diff --git a/themes/mantis/app/entity-groups/research-entities/item-pages/person/person.component.html b/themes/mantis/app/entity-groups/research-entities/item-pages/person/person.component.html
index 851a24e961..34b7a9efa5 100644
--- a/themes/mantis/app/entity-groups/research-entities/item-pages/person/person.component.html
+++ b/themes/mantis/app/entity-groups/research-entities/item-pages/person/person.component.html
@@ -4,7 +4,7 @@
 
             <div class="col-12 col-md-2 d-flex flex-md-column justify-content-between">
                 <ds-metadata-field-wrapper>
-                    <ds-thumbnail [thumbnail]="this.item.getThumbnail() | async"
+                    <ds-thumbnail [thumbnail]="item.getThumbnail() | async"
                                   [defaultImage]="'assets/images/person-placeholder.svg'"></ds-thumbnail>
                 </ds-metadata-field-wrapper>
                 <div>
@@ -25,10 +25,18 @@
                                                     [fields]="['person.email']"
                                                     [label]="'person.page.email'">
                         </ds-generic-item-page-field>
+<!--                        <ds-generic-item-page-field [item]="item"-->
+<!--                                                    [fields]="['person.identifier.orcid']"-->
+<!--                                                    [label]="'person.page.orcid'">-->
+<!--                        </ds-generic-item-page-field>-->
                         <ds-generic-item-page-field [item]="item"
                                                     [fields]="['person.birthDate']"
                                                     [label]="'person.page.birthdate'">
                         </ds-generic-item-page-field>
+<!--                        <ds-generic-item-page-field [item]="item"-->
+<!--                                                    [fields]="['person.identifier.staffid']"-->
+<!--                                                    [label]="'person.page.staffid'">-->
+<!--                        </ds-generic-item-page-field>-->
                     </div>
                     <div class="col-12 col-md-6">
                         <ds-generic-item-page-field [item]="item"
diff --git a/themes/mantis/app/entity-groups/research-entities/item-pages/project/project.component.html b/themes/mantis/app/entity-groups/research-entities/item-pages/project/project.component.html
index 9b8f1532ae..dd48455b0d 100644
--- a/themes/mantis/app/entity-groups/research-entities/item-pages/project/project.component.html
+++ b/themes/mantis/app/entity-groups/research-entities/item-pages/project/project.component.html
@@ -4,7 +4,7 @@
 
             <div class="col-12 col-md-2 d-flex flex-md-column justify-content-between">
                 <ds-metadata-field-wrapper>
-                    <ds-thumbnail [thumbnail]="this.item.getThumbnail() | async"
+                    <ds-thumbnail [thumbnail]="item.getThumbnail() | async"
                                   [defaultImage]="'assets/images/project-placeholder.svg'"></ds-thumbnail>
                 </ds-metadata-field-wrapper>
                 <div>
@@ -16,9 +16,7 @@
             </div>
             <div class="col-12 col-md-10">
                 <h2 class="item-page-title-field">
-                  {{'project.page.titleprefix' | translate}}
-                    <ds-metadata-values
-                            [mdValues]="item?.allMetadata(['project.identifier.name'])"></ds-metadata-values>
+                    {{'project.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="item?.allMetadata(['dc.title'])"></ds-metadata-values>
                 </h2>
                 <div class="row">
                     <div class="col-12 col-md-6">
@@ -31,14 +29,14 @@
                                                   [fields]="['project.identifier.funder']"
                                                   [label]="'project.page.funder'">
                       </ds-generic-item-page-field>
-                        <ds-generic-item-page-field [item]="item"
-                                                    [fields]="['project.identifier.status']"
-                                                    [label]="'project.page.status'">
-                        </ds-generic-item-page-field>
-                        <ds-generic-item-page-field [item]="item"
-                                                    [fields]="['project.identifier.expectedcompletion']"
-                                                    [label]="'project.page.expectedcompletion'">
-                        </ds-generic-item-page-field>
+<!--                        <ds-generic-item-page-field [item]="item"-->
+<!--                                                    [fields]="['project.identifier.status']"-->
+<!--                                                    [label]="'project.page.status'">-->
+<!--                        </ds-generic-item-page-field>-->
+<!--                        <ds-generic-item-page-field [item]="item"-->
+<!--                                                    [fields]="['project.identifier.expectedcompletion']"-->
+<!--                                                    [label]="'project.page.expectedcompletion'">-->
+<!--                        </ds-generic-item-page-field>-->
                     </div>
                     <div class="col-12 col-md-6">
                       <ds-generic-item-page-field [item]="item"