angular: adjusts to relationships

jhipster · Jul 29, 2022 · 4875636 · 4875636
1 parent aec96e5
commit 4875636
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/...s/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.html.ejs b/...s/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.html.ejs
@@ -74,21 +74,21 @@ _%>
                 <dt><span <%= jhiPrefix %>Translate="<%= i18nKeyPrefix %>.<%= relationshipName %>"><%- this._getEntityClientTranslation(i18nKeyPrefix + '.' + relationshipName) %></span></dt>
                 <dd>
     <%_ if (relationship.otherEntityUser) { _%>
-        <%_ if (relationship.relationshipManyToMany) { _%>
+        <%_ if (relationship.collection) { _%>
                     <span *ngFor="let <%= relationshipFieldName %> of <%= entityInstance %>.<%= relationshipFieldNamePlural %>; let last = last">
-                        {{ <%= relationshipFieldName %><% if (!relationship.relatedField.id) { %>?<% } %>.<%= otherEntityField %> }}{{ last ? '' : ', ' }}
+                        {{ <%= relationshipFieldName %>.<%= otherEntityField %> }}{{ last ? '' : ', ' }}
                     </span>
         <%_ } else { _%>
-                    <span>{{ <%= entityInstance %>.<%= relationshipFieldName %><% if (!relationship.relatedField.id) { %>?<% } %>.<%= otherEntityField %> }}</span>
+                    <span>{{ <%= entityInstance %>.<%= relationshipFieldName %>?.<%= otherEntityField %> }}</span>
         <%_ } _%>
     <%_ } else { _%>
-        <%_ if (relationship.relationshipManyToMany) { _%>
+        <%_ if (relationship.collection) { _%>
                     <span *ngFor="let <%= relationshipFieldName %> of <%= entityInstance %>.<%= relationshipFieldNamePlural %>; let last = last">
-                        <a [routerLink]="['/<%= otherEntityStateName %>', <%= relationshipFieldName %>.<%= relationship.otherEntity.primaryKey.name %>, 'view']">{{ <%= relationshipFieldName %><% if (!relationship.relatedField.id) { %>?<% } %>.<%= otherEntityField %> }}</a>{{ last ? '' : ', ' }}
+                        <a [routerLink]="['/<%= otherEntityStateName %>', <%= relationshipFieldName %>.<%= relationship.otherEntity.primaryKey.name %>, 'view']">{{ <%= relationshipFieldName %>.<%= otherEntityField %> }}</a>{{ last ? '' : ', ' }}
                     </span>
         <%_ } else { _%>
                     <div *ngIf="<%= entityInstance + '.' + relationshipFieldName %>">
-                        <a [routerLink]="['/<%= otherEntityStateName %>', <%= entityInstance + '.' + relationshipFieldName + '.' + relationship.otherEntity.primaryKey.name %>, 'view']">{{ <%= entityInstance %>.<%= relationshipFieldName %><% if (!relationship.relatedField.id) { %>?<% } %>.<%= otherEntityField %> }}</a>
+                        <a [routerLink]="['/<%= otherEntityStateName %>', <%= entityInstance + '.' + relationshipFieldName + '.' + relationship.otherEntity.primaryKey.name %>, 'view']">{{ <%= entityInstance %>.<%= relationshipFieldName %>?.<%= otherEntityField %> }}</a>
                     </div>
         <%_ } _%>
     <%_ } _%>

diff --git a/.../templates/angular/src/main/webapp/app/entities/list/entity-management.component.html.ejs b/.../templates/angular/src/main/webapp/app/entities/list/entity-management.component.html.ejs
@@ -132,21 +132,21 @@ _%>
     _%>
                     <td>
         <%_ if (relationship.otherEntityUser) { _%>
-            <%_ if (relationship.relationshipManyToMany) { _%>
+            <%_ if (relationship.collection) { _%>
                         <span *ngFor="let <%= relationshipFieldName %> of <%= entityInstance %>.<%= relationshipFieldNamePlural %>; let last = last">
-                            {{ <%= relationshipFieldName %><% if (!relationship.relatedField.id) { %>?<% } %>.<%= otherEntityField %> }}{{ last ? '' : ', ' }}
+                            {{ <%= relationshipFieldName %>.<%= otherEntityField %> }}{{ last ? '' : ', ' }}
                         </span>
             <%_ } else { _%>
-                        {{ <%= entityInstance %>.<%= relationshipFieldName %><% if (!relationship.relatedField.id) { %>?<% } %>.<%= otherEntityField %> }}
+                        {{ <%= entityInstance %>.<%= relationshipFieldName %>?.<%= otherEntityField %> }}
             <%_ } _%>
         <%_ } else { _%>
-            <%_ if (relationship.relationshipManyToMany) { _%>
+            <%_ if (relationship.collection) { _%>
                         <span *ngFor="let <%= relationshipFieldName %> of <%= entityInstance %>.<%= relationshipFieldNamePlural %>; let last = last">
-                            <a class="form-control-static" [routerLink]="['/<%= relationship.otherEntity.entityPage %>', <%= relationshipFieldName %>.<%= relationship.otherEntity.primaryKey.name %>, 'view']">{{ <%= relationshipFieldName %><% if (!relationship.relatedField.id) { %>?<% } %>.<%= otherEntityField %> }}</a>{{ last ? '' : ', ' }}
+                            <a class="form-control-static" [routerLink]="['/<%= relationship.otherEntity.entityPage %>', <%= relationshipFieldName %>.<%= relationship.otherEntity.primaryKey.name %>, 'view']">{{ <%= relationshipFieldName %>.<%= otherEntityField %> }}</a>{{ last ? '' : ', ' }}
                         </span>
             <%_ } else { _%>
                         <div *ngIf="<%= entityInstance + "." + relationshipFieldName %>">
-                            <a [routerLink]="['/<%= relationship.otherEntity.entityPage %>', <%= entityInstance %>.<%= relationshipFieldName %>.<%= relationship.otherEntity.primaryKey.name %>, 'view']">{{ <%= entityInstance %>.<%= relationshipFieldName %><% if (!relationship.relatedField.id) { %>?<% } %>.<%= otherEntityField %> }}</a>
+                            <a [routerLink]="['/<%= relationship.otherEntity.entityPage %>', <%= entityInstance %>.<%= relationshipFieldName %>.<%= relationship.otherEntity.primaryKey.name %>, 'view']">{{ <%= entityInstance %>.<%= relationshipFieldName %>?.<%= otherEntityField %> }}</a>
                         </div>
             <%_ } _%>
         <%_ } _%>