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 ae...@apache.org on 2016/06/13 21:19:15 UTC
[02/25] hadoop git commit: HDFS-7987. Allow files / directories to be
moved (Ravi Prakash via aw)
HDFS-7987. Allow files / directories to be moved (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/d44f4745
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d44f4745
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d44f4745
Branch: refs/heads/HDFS-1312
Commit: d44f4745b4a186dd06dd6837a85ad90a237d7d97
Parents: 0b7b8a3
Author: Allen Wittenauer <aw...@apache.org>
Authored: Fri Jun 10 09:02:28 2016 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Fri Jun 10 09:02:28 2016 -0700
----------------------------------------------------------------------
.../src/main/webapps/hdfs/explorer.html | 9 +++
.../src/main/webapps/hdfs/explorer.js | 83 ++++++++++++++++----
.../src/main/webapps/static/hadoop.css | 7 ++
3 files changed, 83 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d44f4745/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 51f72e5..ad8c374 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
@@ -179,6 +179,13 @@
data-target="#modal-upload-file" title="Upload Files">
<span class="glyphicon glyphicon-cloud-upload"></span>
</button>
+ <button class="btn btn-default dropdown-toggle" type="button"
+ data-toggle="dropdown" title="Cut & Paste">
+ <span class="glyphicon glyphicon-list-alt"></span></button>
+ <ul class="dropdown-menu cut-paste">
+ <li><a id="explorer-cut">Cut</a></li>
+ <li><a id="explorer-paste">Paste</a></li>
+ </ul>
</div>
</div>
@@ -236,6 +243,7 @@
<table class="table" id="table-explorer">
<thead>
<tr>
+ <th><input type="checkbox" id="file-selector-all"></th>
<th title="Permissions">Permission</th>
<th>Owner</th>
<th>Group</th>
@@ -251,6 +259,7 @@
{#FileStatus}
<tr inode-path="{pathSuffix}" data-permission="{permission}"
class="explorer-entry">
+ <td><input type="checkbox" class="file_selector"> </td>
<td><span class="explorer-perm-links editable-click">
{type|helper_to_directory}{permission|helper_to_permission}
{aclBit|helper_to_acl_bit}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d44f4745/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 6fa5f19..1739db2 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
@@ -310,22 +310,28 @@
var absolute_file_path = append_path(current_directory, inode_name);
delete_path(inode_name, absolute_file_path);
});
-
- $('#table-explorer').dataTable( {
- 'lengthMenu': [ [25, 50, 100, -1], [25, 50, 100, "All"] ],
- 'columns': [
- {'searchable': false }, //Permissions
- null, //Owner
- null, //Group
- { 'searchable': false, 'render': func_size_render}, //Size
- { 'searchable': false, 'render': func_time_render}, //Last Modified
- { 'searchable': false }, //Replication
- null, //Block Size
- null, //Name
- { 'sortable' : false } //Trash
- ],
- "deferRender": true
- });
+
+ $('#file-selector-all').click(function() {
+ $('.file_selector').prop('checked', $('#file-selector-all')[0].checked );
+ });
+
+ //This needs to be last because it repaints the table
+ $('#table-explorer').dataTable( {
+ 'lengthMenu': [ [25, 50, 100, -1], [25, 50, 100, "All"] ],
+ 'columns': [
+ { 'orderable' : false }, //select
+ {'searchable': false }, //Permissions
+ null, //Owner
+ null, //Group
+ { 'searchable': false, 'render': func_size_render}, //Size
+ { 'searchable': false, 'render': func_time_render}, //Last Modified
+ { 'searchable': false }, //Replication
+ null, //Block Size
+ null, //Name
+ { 'orderable' : false } //Trash
+ ],
+ "deferRender": true
+ });
});
}).error(network_error_handler(url));
}
@@ -417,5 +423,50 @@
}
});
+ //Store the list of files which have been checked into session storage
+ function store_selected_files(current_directory) {
+ sessionStorage.setItem("source_directory", current_directory);
+ var selected_files = $("input:checked.file_selector");
+ var selected_file_names = new Array();
+ selected_files.each(function(index) {
+ selected_file_names[index] = $(this).closest('tr').attr('inode-path');
+ })
+ sessionStorage.setItem("selected_file_names", JSON.stringify(selected_file_names));
+ alert("Cut " + selected_file_names.length + " files/directories");
+ }
+
+ //Retrieve the list of files from session storage and rename them to the current
+ //directory
+ function paste_selected_files() {
+ var files = JSON.parse(sessionStorage.getItem("selected_file_names"));
+ var source_directory = sessionStorage.getItem("source_directory");
+ $.each(files, function(index, value) {
+ var url = "/webhdfs/v1"
+ + encode_path(append_path(source_directory, value))
+ + '?op=RENAME&destination='
+ + encode_path(append_path(current_directory, value));
+ $.ajax({
+ type: 'PUT',
+ url: url
+ }).done(function(data) {
+ if(index == files.length - 1) {
+ browse_directory(current_directory);
+ }
+ }).error(function(jqXHR, textStatus, errorThrown) {
+ show_err_msg("Couldn't move file " + value + ". " + errorThrown);
+ });
+
+ })
+ }
+
+ $('#explorer-cut').click(function() {
+ store_selected_files(current_directory);
+ });
+
+ $('#explorer-paste').click(function() {
+ paste_selected_files();
+ });
+
+
init();
})();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d44f4745/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/hadoop.css
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/hadoop.css b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/hadoop.css
index 2ed5f29..5021fb5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/hadoop.css
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/hadoop.css
@@ -285,4 +285,11 @@ header.bs-docs-nav, header.bs-docs-nav .navbar-brand {
margin-bottom: 0;
font-weight: normal;
cursor: pointer;
+}
+
+.cut-paste {
+ width: 75px;
+ min-width: 75px;
+ float: right;
+ left: 75px;
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org