Skip to content

Commit 77b39aa

Browse files
committed
Merge Branch 2.7.11.0-python3 to master
1 parent 4e5950d commit 77b39aa

File tree

1,715 files changed

+22648
-12864
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,715 files changed

+22648
-12864
lines changed

README.en.md

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Ambari_2.7.5_python3
2+
3+
#### Description
4+
Ambari 2.7.5 适配 Python3.
5+
6+
#### Software Architecture
7+
Software architecture description
8+
9+
#### Installation
10+
11+
1. xxxx
12+
2. xxxx
13+
3. xxxx
14+
15+
#### Instructions
16+
17+
1. xxxx
18+
2. xxxx
19+
3. xxxx
20+
21+
#### Contribution
22+
23+
1. Fork the repository
24+
2. Create Feat_xxx branch
25+
3. Commit your code
26+
4. Create Pull Request
27+
28+
29+
#### Gitee Feature
30+
31+
1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
32+
2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
33+
3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
34+
4. The most valuable open source project [GVP](https://gitee.com/gvp)
35+
5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
36+
6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

ambari-admin/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
<parent>
2020
<groupId>org.apache.ambari</groupId>
2121
<artifactId>ambari-project</artifactId>
22-
<version>2.7.9.0.0</version>
22+
<version>2.7.11.0.0</version>
2323
<relativePath>../ambari-project</relativePath>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<groupId>org.apache.ambari</groupId>
2727
<artifactId>ambari-admin</artifactId>
2828
<packaging>jar</packaging>
2929
<name>Ambari Admin View</name>
30-
<version>2.7.9.0.0</version>
30+
<version>2.7.11.0.0</version>
3131
<description>Admin control panel</description>
3232
<build>
3333
<plugins>

ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/SideNavCtrl.js

+21-8
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,27 @@ angular.module('ambariAdminConsole')
3535
}
3636

3737
function initNavigationBar () {
38-
$('body').on('DOMNodeInserted', '.navigation-bar', function() {
39-
$('.navigation-bar').navigationBar({
40-
fitHeight: true,
41-
collapseNavBarClass: 'fa-angle-double-left',
42-
expandNavBarClass: 'fa-angle-double-right'
43-
});
44-
//initTooltips();
45-
$('body').off('DOMNodeInserted', '.navigation-bar');
38+
const observer = new MutationObserver(mutations => {
39+
var targetNode
40+
if (mutations.some((mutation) => mutation.type === 'childList' && (targetNode = $('.navigation-bar')).length)) {
41+
observer.disconnect();
42+
//initTooltips();
43+
targetNode.navigationBar({
44+
fitHeight: true,
45+
collapseNavBarClass: 'fa-angle-double-left',
46+
expandNavBarClass: 'fa-angle-double-right'
47+
});
48+
}
49+
});
50+
51+
setTimeout(() => {
52+
// remove observer if selected element is not found in 10secs.
53+
observer.disconnect();
54+
}, 10000)
55+
56+
observer.observe(document.body, {
57+
childList: true,
58+
subtree: true
4659
});
4760
}
4861

ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
</a>
9696
<ul class="dropdown-menu">
9797
<li ng-repeat="cluster in dropDownClusters">
98-
<a href="javascript:void(null)" ng-click="goToCluster()">
98+
<a href="" ng-click="goToCluster()">
9999
<span>{{cluster.Clusters.cluster_name}}</span>
100100
</a>
101101
</li>

ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
</a>
8282
</li>
8383
<li>
84-
<a href="javascript:void(0);" ng-click="addVersion()">
84+
<a href="" ng-click="addVersion()">
8585
{{'versions.addVersion' | translate}} ...
8686
</a>
8787
</li>

0 commit comments

Comments
 (0)