You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aw...@apache.org on 2016/06/04 00:07:50 UTC
[1/2] hadoop git commit: HDFS-9877. HDFS Namenode UI: Fix browsing
directories that need to be encoded (Ravi Prakash via aw)
Repository: hadoop
Updated Branches:
refs/heads/trunk 713cb7182 -> 99a771cd7
HDFS-9877. HDFS Namenode UI: Fix browsing directories that need to be encoded (Ravi Prakash via aw)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/15f01843
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/15f01843
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/15f01843
Branch: refs/heads/trunk
Commit: 15f018434c5b715729488fd0b03a11f1bc943470
Parents: 713cb71
Author: Allen Wittenauer <aw...@apache.org>
Authored: Fri Jun 3 17:06:29 2016 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Fri Jun 3 17:06:29 2016 -0700
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/15f01843/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js
index 102da9d..adb83a8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js
@@ -33,7 +33,7 @@
$(window).bind('hashchange', function () {
$('#alert-panel').hide();
- var dir = window.location.hash.slice(1);
+ var dir = decodeURIComponent(window.location.hash.slice(1));
if(dir == "") {
dir = "/";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/2] hadoop git commit: HDFS-7767. Use the noredirect flag in
WebHDFS to allow web browsers to upload files via the NN UI (Ravi Prakash via
aw)
Posted by aw...@apache.org.
HDFS-7767. Use the noredirect flag in WebHDFS to allow web browsers to upload files via the NN UI (Ravi Prakash via aw)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/99a771cd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/99a771cd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/99a771cd
Branch: refs/heads/trunk
Commit: 99a771cd7a3f792a76ac89c406b82a983c059d28
Parents: 15f0184
Author: Allen Wittenauer <aw...@apache.org>
Authored: Fri Jun 3 17:07:39 2016 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Fri Jun 3 17:07:39 2016 -0700
----------------------------------------------------------------------
.../src/main/webapps/hdfs/explorer.html | 25 +++++++++-
.../src/main/webapps/hdfs/explorer.js | 51 ++++++++++++++++++++
2 files changed, 74 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/99a771cd/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
index 5106006..51f72e5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
@@ -119,6 +119,23 @@
</div>
</div>
+ <div class="modal" id="modal-upload-file" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header"><button type="button" class="close"
+ data-dismiss="modal" aria-hidden="true">×</button>
+ <h4 class="modal-title" id="file-upload-title">Upload File</h4>
+ </div>
+ <div class="modal-body" id="file-upload-body">
+ <input id="modal-upload-file-input" type="file" class="file" multiple>
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-success" data-dismiss="modal">Close</button>
+ <button type="button" class="btn btn-success" id="modal-upload-file-button" data-complete-text="Uploading...">Upload</button>
+ </div>
+ </div>
+ </div>
+ </div>
<div class="modal" id="delete-modal" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
@@ -142,7 +159,7 @@
</div>
<div class="row">
- <div class="col-xs-11">
+ <div class="col-xs-10 col-md-10">
<form onsubmit="return false;">
<div class="input-group">
<input type="text" class="form-control" id="directory"/>
@@ -152,12 +169,16 @@
</div>
</form>
</div>
- <div class="col-xs-1">
+ <div class="col-xs-2 col-md-2">
<button type="button" class="btn btn-default" data-toggle="modal"
aria-label="New Directory" data-target="#btn-create-directory"
title="Create Directory">
<span class="glyphicon glyphicon-folder-open"></span>
</button>
+ <button type="button" class="btn btn-default" data-toggle="modal"
+ data-target="#modal-upload-file" title="Upload Files">
+ <span class="glyphicon glyphicon-cloud-upload"></span>
+ </button>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/99a771cd/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js
index adb83a8..6fa5f19 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js
@@ -366,5 +366,56 @@
});
})
+ $('#modal-upload-file-button').click(function() {
+ $(this).prop('disabled', true);
+ $(this).button('complete');
+ var files = []
+ var numCompleted = 0
+
+ for(var i = 0; i < $('#modal-upload-file-input').prop('files').length; i++) {
+ (function() {
+ var file = $('#modal-upload-file-input').prop('files')[i];
+ var url = '/webhdfs/v1' + current_directory;
+ url = encode_path(append_path(url, file.name));
+ url += '?op=CREATE&noredirect=true';
+ files.push( { file: file } )
+ files[i].request = $.ajax({
+ type: 'PUT',
+ url: url,
+ processData: false,
+ crossDomain: true
+ });
+ })()
+ }
+ for(var f in files) {
+ (function() {
+ var file = files[f];
+ file.request.done(function(data) {
+ var url = data['Location'];
+ $.ajax({
+ type: 'PUT',
+ url: url,
+ data: file.file,
+ processData: false,
+ crossDomain: true
+ }).complete(function(data) {
+ numCompleted++;
+ if(numCompleted == files.length) {
+ $('#modal-upload-file').modal('hide');
+ $('#modal-upload-file-button').button('reset');
+ browse_directory(current_directory);
+ }
+ }).error(function(jqXHR, textStatus, errorThrown) {
+ numCompleted++;
+ show_err_msg("Couldn't upload the file " + file.file.name + ". "+ errorThrown);
+ });
+ }).error(function(jqXHR, textStatus, errorThrown) {
+ numCompleted++;
+ show_err_msg("Couldn't find datanode to write file. " + errorThrown);
+ });
+ })();
+ }
+ });
+
init();
})();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org