|
@@ -34,10 +34,9 @@ try:
|
|
|
except ImportError:
|
|
except ImportError:
|
|
|
import simplejson as json
|
|
import simplejson as json
|
|
|
|
|
|
|
|
-from django import forms
|
|
|
|
|
from django.contrib import messages
|
|
from django.contrib import messages
|
|
|
from django.contrib.auth.models import User, Group
|
|
from django.contrib.auth.models import User, Group
|
|
|
-from django.core import urlresolvers, serializers
|
|
|
|
|
|
|
+from django.core import urlresolvers
|
|
|
from django.template.defaultfilters import stringformat, filesizeformat
|
|
from django.template.defaultfilters import stringformat, filesizeformat
|
|
|
from django.http import Http404, HttpResponse, HttpResponseNotModified
|
|
from django.http import Http404, HttpResponse, HttpResponseNotModified
|
|
|
from django.views.decorators.http import require_http_methods
|
|
from django.views.decorators.http import require_http_methods
|
|
@@ -56,8 +55,7 @@ from desktop.lib.exceptions import PopupException
|
|
|
from filebrowser.lib.archives import archive_factory
|
|
from filebrowser.lib.archives import archive_factory
|
|
|
from filebrowser.lib.rwx import filetype, rwx
|
|
from filebrowser.lib.rwx import filetype, rwx
|
|
|
from filebrowser.lib import xxd
|
|
from filebrowser.lib import xxd
|
|
|
-from filebrowser.forms import RenameForm, UploadFileForm, UploadArchiveForm, MkDirForm,\
|
|
|
|
|
- RmDirForm, RmTreeForm, RemoveForm, ChmodForm, ChownForm, EditorForm, TouchForm,\
|
|
|
|
|
|
|
+from filebrowser.forms import RenameForm, UploadFileForm, UploadArchiveForm, MkDirForm, EditorForm, TouchForm,\
|
|
|
RenameFormSet, RmTreeFormSet, ChmodFormSet,ChownFormSet
|
|
RenameFormSet, RmTreeFormSet, ChmodFormSet,ChownFormSet
|
|
|
from hadoop.fs.hadoopfs import Hdfs
|
|
from hadoop.fs.hadoopfs import Hdfs
|
|
|
from hadoop.fs.exceptions import WebHdfsException
|
|
from hadoop.fs.exceptions import WebHdfsException
|
|
@@ -148,6 +146,14 @@ def view(request, path):
|
|
|
raise PopupException(msg , detail=e)
|
|
raise PopupException(msg , detail=e)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+def home_relative_view(request, path):
|
|
|
|
|
+ home_dir_path = request.user.get_home_directory()
|
|
|
|
|
+ if request.fs.exists(home_dir_path):
|
|
|
|
|
+ path = '%s%s' % (home_dir_path, path)
|
|
|
|
|
+
|
|
|
|
|
+ return view(request, path)
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
def edit(request, path, form=None):
|
|
def edit(request, path, form=None):
|
|
|
"""Shows an edit form for the given path. Path does not necessarily have to exist."""
|
|
"""Shows an edit form for the given path. Path does not necessarily have to exist."""
|
|
|
|
|
|