You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2018/02/21 10:35:08 UTC
[ambari] branch trunk updated: AMBARI-23031 View name is not
displayed in ambari-views page
This is an automated email from the ASF dual-hosted git repository.
atkach pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1495e51 AMBARI-23031 View name is not displayed in ambari-views page
1495e51 is described below
commit 1495e513af4b28c2289b69dac079512ea2f086ae
Author: Andrii Tkach <at...@apache.org>
AuthorDate: Tue Feb 20 17:05:05 2018 +0200
AMBARI-23031 View name is not displayed in ambari-views page
---
.../src/main/resources/ui/admin-web/app/scripts/i18n.config.js | 1 +
.../resources/ui/admin-web/app/views/ambariViews/viewsList.html | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
index 4a13e02..06d2e6f 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
@@ -193,6 +193,7 @@ angular.module('ambariAdminConsole')
'views.visible': 'Visible',
'views.description': 'Description',
'views.shortUrl': 'Short URL',
+ 'views.urlName': 'URL Name',
'views.instanceDescription': 'Instance Description',
'views.clusterConfiguration': 'Cluster Configuration',
'views.localCluster': 'Local Cluster',
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/viewsList.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/viewsList.html
index 48f445b..ba5803a 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/viewsList.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/viewsList.html
@@ -49,7 +49,7 @@
<span>{{'views.table.viewType' | translate}}</span>
</th>
<th class="col-md-2">
- <span>{{'urls.viewInstance' | translate}}</span>
+ <span>{{'views.urlName' | translate}}</span>
</th>
<th class="col-md-2 entity-actions">
<span>{{'common.actions' | translate}}</span>
@@ -60,7 +60,7 @@
<tbody>
<tr ng-repeat="instance in instances | filter : { isShowed: true }">
<td>
- <span>{{instance.short_url_name}}</span>
+ <span>{{instance.instance_name}}</span>
</td>
<td>
<a target="_blank"
@@ -71,7 +71,7 @@
<span>{{instance.view_name}} {{"{"+instance.version+"}"}} </span>
</td>
<td>
- <span>{{instance.instance_name}}</span>
+ <span>{{instance.short_url_name}}</span>
</td>
<td class="entity-actions" ng-switch="instance.versionObj.status">
<span ng-switch-when="PENDING">
--
To stop receiving notification emails like this one, please contact
atkach@apache.org.