big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-15277. Parent directory in the explorer does not support all path formats. Contributed by Jianfei Jiang.

Browse Source
This commit is contained in:
Ayush Saxena 2020-04-15 23:01:58 +05:30
parent 4d24d99e85
commit cc5c1da7c1
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/explorer.js
View File

@ -300,6 +300,11 @@
} }
function browse_directory(dir) { function browse_directory(dir) {
if (dir.match('^/+$')) {
$('#parentDir').prop('disabled', true);
} else {
$('#parentDir').prop('disabled', false);
}
var HELPERS = { var HELPERS = {
'helper_date_tostring' : function (chunk, ctx, bodies, params) { 'helper_date_tostring' : function (chunk, ctx, bodies, params) {
var value = dust.helpers.tap(params.value, chunk, ctx); var value = dust.helpers.tap(params.value, chunk, ctx);
@ -378,11 +383,10 @@
$('#parentDir').click(function () { $('#parentDir').click(function () {
var current = current_directory; var current = current_directory;
var lastIndex = current.lastIndexOf('/'); var parent = current.replace(/\/+[^/]+\/*$/,"") || '/';
var parent = current.substr(0, lastIndex); browse_directory(parent);
browse_directory(parent); });
})
function init() { function init() {
dust.loadSource(dust.compile($('#tmpl-explorer').html(), 'explorer')); dust.loadSource(dust.compile($('#tmpl-explorer').html(), 'explorer'));

10
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js
View File

@ -300,6 +300,11 @@
} }
function browse_directory(dir) { function browse_directory(dir) {
if (dir.match('^/+$')) {
$('#parentDir').prop('disabled', true);
} else {
$('#parentDir').prop('disabled', false);
}
var HELPERS = { var HELPERS = {
'helper_date_tostring' : function (chunk, ctx, bodies, params) { 'helper_date_tostring' : function (chunk, ctx, bodies, params) {
var value = dust.helpers.tap(params.value, chunk, ctx); var value = dust.helpers.tap(params.value, chunk, ctx);
@ -378,10 +383,9 @@
$('#parentDir').click(function () { $('#parentDir').click(function () {
var current = current_directory; var current = current_directory;
var lastIndex = current.lastIndexOf('/'); var parent = current.replace(/\/+[^/]+\/*$/,"") || '/';
var parent = current.substr(0, lastIndex);
browse_directory(parent); browse_directory(parent);
}) });
function init() { function init() {