Skip to content

Commit e89971a

Browse files
moellerthmoellerth
authored
Merge pull request #3464 from dzhw/fix-elsst-link
Fixing ELSST tags search requests
2 parents 86af561 + 5f4cb67 commit e89971a

3 files changed

Lines changed: 65 additions & 30 deletions

File tree

‎mdm-frontend/src/app/legacy/analysispackagemanagement/views/analysis-package-detail.html.tmpl‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,15 @@
1414
<div class="fdz-tag-link-container" ng-if="ctrl.analysisPackageTags.length > 0">
1515
<h5>{{'analysis-package-management.detail.label.tags' | translate}}: </h5>
1616
<a ng-repeat="tag in ctrl.analysisPackageTags"
17-
ng-if="ctrl.isAuthenticated()"
17+
ng-if="ctrl.isAuthenticated() && !ctrl.isProviderView"
18+
ui-sref="searchReleased({type: 'analysis_packages', 'tags': tag})">
19+
<span>{{tag}}{{!$last?',&nbsp;':''}}</span>
20+
<md-tooltip md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
21+
{{'analysis-package-management.detail.tag-tooltip' | translate}}
22+
</md-tooltip>
23+
</a>
24+
<a ng-repeat="tag in ctrl.analysisPackageTags"
25+
ng-if="ctrl.isAuthenticated() && ctrl.isProviderView"
1826
ui-sref="search({type: 'analysis_packages', 'query': tag})">
1927
<span>{{tag}}{{!$last?',&nbsp;':''}}</span>
2028
<md-tooltip md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
@@ -45,16 +53,24 @@
4553
</div>
4654
<div>
4755
<a ng-repeat="tagElsst in ctrl.analysisPackageTagsElsst"
48-
ng-if="ctrl.isAuthenticated()"
49-
ui-sref="search({type: 'analysis_packages', 'query': tagElsst.prefLabel})">
56+
ng-if="ctrl.isAuthenticated() && !ctrl.isProviderView"
57+
ui-sref="searchReleased({type: 'analysis_packages', 'tagsElsst': tagElsst.prefLabel})">
5058
<span>{{tagElsst.prefLabel}}{{!$last?',&nbsp;':''}}</span>
5159
<md-tooltip md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
5260
{{'analysis-package-management.detail.tagElsst-tooltip' | translate}}
5361
</md-tooltip>
5462
</a>
63+
<a ng-repeat="tagElsst in ctrl.dataPackageTagsElsst"
64+
ng-if="ctrl.isAuthenticated() && ctrl.isProviderView"
65+
ui-sref="search({type: 'data_packages', 'query': tagElsst.prefLabel})">
66+
<span>{{tagElsst.prefLabel}}{{!$last?',&nbsp;':''}}</span>
67+
<md-tooltip md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
68+
{{'data-package-management.detail.tagElsst-tooltip' | translate}}
69+
</md-tooltip>
70+
</a>
5571
<a ng-repeat="tagElsst in ctrl.analysisPackageTagsElsst"
5672
ng-if="!ctrl.isAuthenticated()"
57-
ui-sref="search({type: 'analysis_packages', 'tags': tagElsst.prefLabel})">
73+
ui-sref="search({type: 'analysis_packages', 'tagsElsst': tagElsst.prefLabel})">
5874
<span>{{tagElsst.prefLabel}}{{!$last?',&nbsp;':''}}</span>
5975
<md-tooltip md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
6076
{{'analysis-package-management.detail.tagElsst-tooltip' | translate}}

‎mdm-frontend/src/app/legacy/conceptmanagement/views/concept-detail.html.tmpl‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,25 @@
1212
</div>
1313
<div class="fdz-tag-link-container" ng-if="ctrl.conceptTags.length > 0">
1414
<h5>{{'data-package-management.detail.label.tags' | translate}}: </h5>
15+
<!-- When in order view search for data packages as concepts cannot be searched from that view -->
1516
<a ng-repeat="tag in ctrl.conceptTags"
16-
ng-if="ctrl.isAuthenticated()"
17+
ng-if="ctrl.isAuthenticated() && !ctrl.isProviderView"
18+
ui-sref="searchReleased({type: 'data_packages', 'query': tag})">
19+
<span>{{tag}}{{!$last?',&nbsp;':''}}</span>
20+
<md-tooltip md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
21+
{{'data-package-management.detail.tag-tooltip' | translate}}
22+
</md-tooltip>
23+
</a>
24+
<!-- When in provider view search for concepts -->
25+
<a ng-repeat="tag in ctrl.conceptTags"
26+
ng-if="ctrl.isAuthenticated() && ctrl.isProviderView"
1727
ui-sref="search({type: 'concepts', 'query': tag})">
1828
<span>{{tag}}{{!$last?',&nbsp;':''}}</span>
1929
<md-tooltip md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
2030
{{'data-package-management.detail.tag-tooltip' | translate}}
2131
</md-tooltip>
2232
</a>
33+
<!-- When in unauthenticated order view search for data packages as concepts cannot be searched from that view -->
2334
<a ng-repeat="tag in ctrl.conceptTags"
2435
ng-if="!ctrl.isAuthenticated()"
2536
ui-sref="search({type: 'data_packages', 'query': tag})" rel="nofollow">
@@ -43,17 +54,28 @@
4354
<h5>: </h5>
4455
</div>
4556
<div>
57+
<!-- When in order view search for data packages as concepts cannot be searched from that view -->
4658
<a ng-repeat="tagElsst in ctrl.conceptTagsElsst"
47-
ng-if="ctrl.isAuthenticated()"
48-
ui-sref="search({type: 'concepts', 'query': tagElsst.prefLabel})">
59+
ng-if="ctrl.isAuthenticated() && !ctrl.isProviderView"
60+
ui-sref="searchReleased({type: 'data_packages', 'tagsElsst': tagElsst.prefLabel})">
4961
<span>{{tagElsst.prefLabel}}{{!$last?',&nbsp;':''}}</span>
5062
<md-tooltip md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
5163
{{'data-package-management.detail.tagElsst-tooltip' | translate}}
5264
</md-tooltip>
5365
</a>
66+
<!-- When in provider view search for concepts -->
67+
<a ng-repeat="tagElsst in ctrl.dataPackageTagsElsst"
68+
ng-if="ctrl.isAuthenticated() && ctrl.isProviderView"
69+
ui-sref="search({type: 'concepts', 'query': tagElsst.prefLabel})">
70+
<span>{{tagElsst.prefLabel}}{{!$last?',&nbsp;':''}}</span>
71+
<md-tooltip md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
72+
{{'data-package-management.detail.tagElsst-tooltip' | translate}}
73+
</md-tooltip>
74+
</a>
75+
<!-- When in unauthenticated order view search for data packages as concepts cannot be searched from that view -->
5476
<a ng-repeat="tagElsst in ctrl.conceptTagsElsst"
5577
ng-if="!ctrl.isAuthenticated()"
56-
ui-sref="search({type: 'data_packages', 'query': tagElsst.prefLabel})" rel="nofollow">
78+
ui-sref="search({type: 'data_packages', 'tagsElsst': tagElsst.prefLabel})" rel="nofollow">
5779
<span>{{tagElsst.prefLabel}}{{!$last?',&nbsp;':''}}</span>
5880
<md-tooltip md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
5981
{{'data-package-management.detail.tagElsst-tooltip' | translate}}
@@ -62,25 +84,6 @@
6284
</div>
6385
</div>
6486
</div>
65-
<!-- <div class="fdz-tag-link-container" ng-if="ctrl.conceptTagsElsst.length > 0">
66-
<h5>{{'data-package-management.detail.label.tagsElsst' | translate}}: </h5>
67-
<a ng-repeat="tagElsst in ctrl.conceptTagsElsst"
68-
ng-if="ctrl.isAuthenticated()"
69-
ui-sref="search({type: 'concepts', 'query': tagElsst.prefLabel})">
70-
<span>{{tagElsst.prefLabel}}{{!$last?',&nbsp;':''}}</span>
71-
<md-tooltip md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
72-
{{'data-package-management.detail.tagElsst-tooltip' | translate}}
73-
</md-tooltip>
74-
</a>
75-
<a ng-repeat="tagElsst in ctrl.conceptTagsElsst"
76-
ng-if="!ctrl.isAuthenticated()"
77-
ui-sref="search({type: 'data_packages', 'query': tagElsst.prefLabel})" rel="nofollow">
78-
<span>{{tagElsst.prefLabel}}{{!$last?',&nbsp;':''}}</span>
79-
<md-tooltip md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
80-
{{'data-package-management.detail.tagElsst-tooltip' | translate}}
81-
</md-tooltip>
82-
</a>
83-
</div> -->
8487
</div>
8588
<md-divider></md-divider>
8689
<fdz-detail

‎mdm-frontend/src/app/legacy/datapackagemanagement/views/data-package-detail.html.tmpl‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,15 @@
1414
<div class="fdz-tag-link-container" ng-if="ctrl.dataPackageTags.length > 0">
1515
<h5>{{'data-package-management.detail.label.tags' | translate}}: </h5>
1616
<a ng-repeat="tag in ctrl.dataPackageTags"
17-
ng-if="ctrl.isAuthenticated()"
17+
ng-if="ctrl.isAuthenticated() && !ctrl.isProviderView"
18+
ui-sref="searchReleased({type: 'data_packages', 'tags': tag})">
19+
<span>{{tag}}{{!$last?',&nbsp;':''}}</span>
20+
<md-tooltip md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
21+
{{'data-package-management.detail.tag-tooltip' | translate}}
22+
</md-tooltip>
23+
</a>
24+
<a ng-repeat="tag in ctrl.dataPackageTags"
25+
ng-if="ctrl.isAuthenticated() && ctrl.isProviderView"
1826
ui-sref="search({type: 'data_packages', 'query': tag})">
1927
<span>{{tag}}{{!$last?',&nbsp;':''}}</span>
2028
<md-tooltip md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
@@ -45,7 +53,15 @@
4553
</div>
4654
<div>
4755
<a ng-repeat="tagElsst in ctrl.dataPackageTagsElsst"
48-
ng-if="ctrl.isAuthenticated()"
56+
ng-if="ctrl.isAuthenticated() && !ctrl.isProviderView"
57+
ui-sref="searchReleased({type: 'data_packages', 'tagsElsst': tagElsst.prefLabel})">
58+
<span>{{tagElsst.prefLabel}}{{!$last?',&nbsp;':''}}</span>
59+
<md-tooltip md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
60+
{{'data-package-management.detail.tagElsst-tooltip' | translate}}
61+
</md-tooltip>
62+
</a>
63+
<a ng-repeat="tagElsst in ctrl.dataPackageTagsElsst"
64+
ng-if="ctrl.isAuthenticated() && ctrl.isProviderView"
4965
ui-sref="search({type: 'data_packages', 'query': tagElsst.prefLabel})">
5066
<span>{{tagElsst.prefLabel}}{{!$last?',&nbsp;':''}}</span>
5167
<md-tooltip md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
@@ -54,7 +70,7 @@
5470
</a>
5571
<a ng-repeat="tagElsst in ctrl.dataPackageTagsElsst"
5672
ng-if="!ctrl.isAuthenticated()"
57-
ui-sref="search({type: 'data_packages', 'tags': tagElsst.prefLabel})">
73+
ui-sref="search({type: 'data_packages', 'tagsElsst': tagElsst.prefLabel})">
5874
<span>{{tagElsst.prefLabel}}{{!$last?',&nbsp;':''}}</span>
5975
<md-tooltip md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
6076
{{'data-package-management.detail.tagElsst-tooltip' | translate}}

0 commit comments

Comments
 (0)