Merge branch 'master' into doc-zombie-announcement

uPortal-Attic · Mar 8, 2019 · 83896eb · 83896eb
2 parents dc47b34 + 53c7ce6
commit 83896eb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,8 @@ and this project adheres to
 
 ## [Unreleased][]
 
-No changes so far
+* Generate static content div identifier by fname rather than by
+  not-reliably-unique nodeId #876
 
 ### Documentation in unreleased
 

diff --git a/web/src/main/webapp/my-app/layout/static/partials/static-content-exclusive.html b/web/src/main/webapp/my-app/layout/static/partials/static-content-exclusive.html
@@ -24,7 +24,7 @@
   </div>
   <frame-page ng-if="loaded" app-title="{{ portlet.title }}" app-icon="{{ portlet.faIcon }}" page-title="{{ portlet.title }}" app-fname="portlet.fname" app-show-add-to-home="true">
     <md-card>
-      <div ng-bind-html="::portlet.exclusiveContent" class="up-portlet-content-wrapper" id="content-{{ ::portlet.nodeId }}"></div>
+      <div ng-bind-html="::portlet.exclusiveContent" class="up-portlet-content-wrapper" id="content-{{ ::portlet.fname }}"></div>
     </md-card>
   </frame-page>
 </div>
diff --git a/web/src/main/webapp/my-app/layout/static/partials/static-content-max.html b/web/src/main/webapp/my-app/layout/static/partials/static-content-max.html
@@ -24,7 +24,7 @@
   </div>
   <frame-page ng-if="loaded" app-title="{{ portlet.title }}" app-icon="{{ portlet.faIcon }}" page-title="{{ portlet.title }}" app-fname="portlet.fname" app-show-add-to-home="true">
     <md-card>
-      <div ng-bind-html="::portlet.staticContent" class="up-portlet-content-wrapper" id="content-{{ ::portlet.nodeId }}"></div>
+      <div ng-bind-html="::portlet.staticContent" class="up-portlet-content-wrapper" id="content-{{ ::portlet.fname}}"></div>
     </md-card>
   </frame-page>
 </div>