diff --git a/YtManagerApp/templates/YtManagerApp/js/common.js b/YtManagerApp/templates/YtManagerApp/js/common.js
index 03c1f1a..fdf451b 100644
--- a/YtManagerApp/templates/YtManagerApp/js/common.js
+++ b/YtManagerApp/templates/YtManagerApp/js/common.js
@@ -42,4 +42,135 @@ class Dialog {
hideModal() {
this.modal.modal('hide');
}
-}
\ No newline at end of file
+}
+
+
+class AjaxModal
+{
+ constructor(url)
+ {
+ this.wrapper = $("#modal-wrapper");
+ this.loading = $("#modal-loading");
+ this.url = url;
+ this.modal = null;
+ this.form = null;
+ this.submitCallback = null;
+ }
+
+ setSubmitCallback(callback) {
+ this.submitCallback = callback;
+ }
+
+ _showLoading() {
+ this.loading.fadeIn(500);
+ }
+
+ _hideLoading() {
+ this.loading.fadeOut(100);
+ }
+
+ _showModal() {
+ if (this.modal != null)
+ this.modal.modal();
+ }
+
+ _hideModal() {
+ if (this.modal != null)
+ this.modal.modal('hide');
+ }
+
+ _load(result) {
+ this.wrapper.html(result);
+
+ this.modal = this.wrapper.find('.modal');
+ this.form = this.wrapper.find('form');
+
+ let pThis = this;
+ this.form.submit(function(e) {
+ pThis._submit(e);
+ })
+ }
+
+ _loadFailed() {
+ this.wrapper.html('
An error occurred while displaying the dialog!
');
+ }
+
+ _submit(e) {
+ let pThis = this;
+ let url = this.form.attr('action');
+ $.post(this.url, this.form.serialize())
+ .done(function(result) {
+ pThis._submitDone(result);
+ })
+ .fail(function() {
+ pThis._submitFailed();
+ });
+
+ e.preventDefault();
+ }
+
+ _submitDone(result) {
+ // Clear old errors first
+ this.form.find('.modal-field-error').remove();
+
+ if (result.success) {
+ this._hideModal();
+ if (this.submitCallback != null)
+ this.submitCallback();
+ }
+ else {
+ for (let field in result.errors)
+ if (result.errors.hasOwnProperty(field))
+ {
+ let errorsArray = result.errors[field];
+ let errorsConcat = "
";
+
+ for(let error of errorsArray) {
+ errorsConcat += `- ${error.message}
`;
+ }
+ errorsConcat += '
';
+
+ if (field === '__all__')
+ this.form.find('.modal-body').append(errorsConcat);
+ else
+ this.form.find(`[name='${field}']`).after(errorsConcat);
+ }
+
+ let errorsHtml = '';
+
+ let err = this.modal.find('#__modal_error');
+ if (err.length) {
+ err.html('An error occurred');
+ }
+ else {
+ this.modal.find('.modal-body').append(errorsHtml)
+ }
+ }
+ }
+
+ _submitFailed() {
+ // Clear old errors first
+ this.form.find('.modal-field-error').remove();
+
+ this.form.find('.modal-body')
+ .append(`
An error occurred while processing request!
`);
+ }
+
+ loadAndShow()
+ {
+ let pThis = this;
+ this._showLoading();
+
+ $.get(this.url)
+ .done(function (result) {
+ pThis._load(result);
+ pThis._showModal();
+ })
+ .fail(function () {
+ pThis._loadFailed();
+ })
+ .always(function() {
+ pThis._hideLoading();
+ });
+ }
+}
diff --git a/YtManagerApp/templates/YtManagerApp/js/subscription_tree.js b/YtManagerApp/templates/YtManagerApp/js/subscription_tree.js
index 0bacff2..5127f6b 100644
--- a/YtManagerApp/templates/YtManagerApp/js/subscription_tree.js
+++ b/YtManagerApp/templates/YtManagerApp/js/subscription_tree.js
@@ -228,11 +228,19 @@ function treeNode_Edit()
if (selectedNodes.length === 1)
{
let node = selectedNodes[0];
+
if (node.type === 'folder') {
- folderEditDialog.showEdit(node);
+ let id = node.id.replace('folder', '');
+ let modal = new AjaxModal("{% url 'modal_update_folder' 98765 %}".replace('98765', id));
+ modal.setSubmitCallback(tree_Refresh);
+ modal.loadAndShow();
}
else {
- subscriptionEditDialog.showEdit(node);
+ //TODO:
+ //let id = node.id.replace('sub', '');
+ //let modal = new AjaxModal("{ url 'modal_update_subscription' 98765 }".replace('98765', id));
+ //modal.setSubmitCallback(tree_Refresh);
+ //modal.loadAndShow();
}
}
}
@@ -245,22 +253,17 @@ function treeNode_Delete()
let node = selectedNodes[0];
if (node.type === 'folder') {
- let folderId = node.id.toString().replace('folder', '');
- if (confirm('Are you sure you want to delete folder "' + node.text + '" and all its descendants?\nNote: the subscriptions won\'t be deleted, they will only be moved outside.'))
- {
- $.post("{% url 'ajax_delete_folder' 99999 %}".replace('99999', folderId), {
- csrfmiddlewaretoken: '{{ csrf_token }}'
- }).done(tree_Refresh);
- }
+ let id = node.id.replace('folder', '');
+ let modal = new AjaxModal("{% url 'modal_delete_folder' 98765 %}".replace('98765', id));
+ modal.setSubmitCallback(tree_Refresh);
+ modal.loadAndShow();
}
else {
- let subId = node.id.toString().replace('sub', '');
- if (confirm('Are you sure you want to delete subscription "' + node.text + '"?'))
- {
- $.post("{% url 'ajax_delete_subscription' 99999 %}".replace('99999', subId), {
- csrfmiddlewaretoken: '{{ csrf_token }}'
- }).done(tree_Refresh);
- }
+ //TODO:
+ //let id = node.id.replace('sub', '');
+ //let modal = new AjaxModal("{ url 'modal_delete_subscription' 98765 }".replace('98765', id));
+ //modal.setSubmitCallback(tree_Refresh);
+ //modal.loadAndShow();
}
}
}
@@ -318,11 +321,14 @@ function tree_OnSelectionChanged(e, data)
let filterForm_folderId = filterForm.find('#form_video_filter_folder_id');
let filterForm_subId = filterForm.find('#form_video_filter_subscription_id');
-
let node = data.instance.get_selected(true)[0];
// Fill folder/sub fields
- if (node.type === 'folder') {
+ if (node == null) {
+ filterForm_folderId.val('');
+ filterForm_subId.val('');
+ }
+ else if (node.type === 'folder') {
let id = node.id.replace('folder', '');
filterForm_folderId.val(id);
filterForm_subId.val('');
@@ -340,16 +346,16 @@ function tree_OnSelectionChanged(e, data)
function videos_Reload()
{
let filterForm = $('#form_video_filter');
- let loadingDiv = $('#videos_loading');
+ let loadingDiv = $('#videos-loading');
loadingDiv.fadeIn(300);
// Perform query
$.post("{% url 'ajax_index_get_videos' %}", filterForm.serialize())
.done(function (result) {
- $("#videos_wrapper").html(result);
+ $("#videos-wrapper").html(result);
})
.fail(function () {
- $("#videos_wrapper").html('
An error occurred while retrieving the video list!
');
+ $("#videos-wrapper").html('
An error occurred while retrieving the video list!
');
})
.always(function() {
loadingDiv.fadeOut(100);
@@ -387,8 +393,13 @@ $(document).ready(function ()
// folderEditDialog = new FolderEditDialog('#folderEditDialog');
// subscriptionEditDialog = new SubscriptionEditDialog('#subscriptionEditDialog');
//
- // $("#btn_create_sub").on("click", function () { subscriptionEditDialog.showNew(); });
+ $("#btn_create_folder").on("click", function () {
+ let modal = new AjaxModal("{% url 'modal_create_folder' %}");
+ modal.setSubmitCallback(tree_Refresh);
+ modal.loadAndShow();
+ });
+
// $("#btn_create_folder").on("click", function () { folderEditDialog.showNew(); });
- // $("#btn_edit_node").on("click", treeNode_Edit);
- // $("#btn_delete_node").on("click", treeNode_Delete);
+ $("#btn_edit_node").on("click", treeNode_Edit);
+ $("#btn_delete_node").on("click", treeNode_Delete);
});
diff --git a/YtManagerApp/urls.py b/YtManagerApp/urls.py
index 25c65a8..347bbbb 100644
--- a/YtManagerApp/urls.py
+++ b/YtManagerApp/urls.py
@@ -19,7 +19,7 @@ from django.conf.urls.static import static
from django.urls import path
from .views.auth import ExtendedLoginView, RegisterView, RegisterDoneView
-from .views.index import index, ajax_get_tree, ajax_get_videos
+from .views.index import index, ajax_get_tree, ajax_get_videos, CreateFolderModal, UpdateFolderModal, DeleteFolderModal
from .views import old_views
urlpatterns = [
@@ -29,10 +29,20 @@ urlpatterns = [
path('register_done/', RegisterDoneView.as_view(), name='register_done'),
path('', include('django.contrib.auth.urls')),
- path('ajax/index_get_tree', ajax_get_tree, name='ajax_index_get_tree'),
- path('ajax/index_get_videos', ajax_get_videos, name='ajax_index_get_videos'),
+ # Ajax
+ path('ajax/index_get_tree/', ajax_get_tree, name='ajax_index_get_tree'),
+ path('ajax/index_get_videos/', ajax_get_videos, name='ajax_index_get_videos'),
+
+ # Modals
+ path('modal/create_folder/', CreateFolderModal.as_view(), name='modal_create_folder'),
+ path('modal/create_folder/
/', CreateFolderModal.as_view(), name='modal_create_folder'),
+ path('modal/update_folder//', UpdateFolderModal.as_view(), name='modal_update_folder'),
+ path('modal/delete_folder//', DeleteFolderModal.as_view(), name='modal_delete_folder'),
+
+ # Index
path('', index, name='home'),
+
# Old stuff
path('ajax/get_children', old_views.ajax_get_children, name='ajax_get_children'),
path('ajax/get_folders', old_views.ajax_get_folders, name='ajax_get_folders'),
diff --git a/YtManagerApp/views/controls/modal.py b/YtManagerApp/views/controls/modal.py
index ec3472b..52f80dc 100644
--- a/YtManagerApp/views/controls/modal.py
+++ b/YtManagerApp/views/controls/modal.py
@@ -1,8 +1,10 @@
-from django.views.generic import TemplateView
+from django.views.generic.base import ContextMixin
+from django.http import JsonResponse
-class ModalView(TemplateView):
+class ModalMixin(ContextMixin):
template_name = 'YtManagerApp/controls/modal.html'
+ success_url = '/'
def __init__(self, modal_id='dialog', title='', fade=True, centered=True, small=False, large=False, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -32,3 +34,18 @@ class ModalView(TemplateView):
data['modal_title'] = self.title
return data
+
+ def modal_response(self, form, success=True):
+ result = {'success': success}
+ if not success:
+ result['errors'] = form.errors.get_json_data(escape_html=True)
+
+ return JsonResponse(result)
+
+ def form_valid(self, form):
+ super().form_valid(form)
+ return self.modal_response(form, success=True)
+
+ def form_invalid(self, form):
+ super().form_invalid(form)
+ return self.modal_response(form, success=False)
diff --git a/YtManagerApp/views/index.py b/YtManagerApp/views/index.py
index 64ec46a..e1a5b90 100644
--- a/YtManagerApp/views/index.py
+++ b/YtManagerApp/views/index.py
@@ -1,13 +1,15 @@
from django.http import HttpRequest, HttpResponseBadRequest, JsonResponse
from django.shortcuts import render
from django import forms
-from django.views.generic import CreateView
+from django.views.generic import CreateView, UpdateView, DeleteView
from YtManagerApp.management.folders import traverse_tree
from YtManagerApp.management.videos import get_videos
from YtManagerApp.models import Subscription, SubscriptionFolder
-from YtManagerApp.views.controls.modal import ModalView
+from YtManagerApp.views.controls.modal import ModalMixin
from crispy_forms.helper import FormHelper
from crispy_forms.layout import Layout, Field
+from crispy_forms.layout import Submit
+from django.db.models import Q
class VideoFilterForm(forms.Form):
@@ -162,8 +164,62 @@ def ajax_get_videos(request: HttpRequest):
return HttpResponseBadRequest()
-class CreateFolderForm(CreateView, ModalView):
- model = SubscriptionFolder
- template_name = 'YtManagerApp/controls/folder_create_dialog.html'
- fields = ['name', 'parent']
+class SubscriptionFolderForm(forms.ModelForm):
+ class Meta:
+ model = SubscriptionFolder
+ fields = ['name', 'parent']
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+ self.helper = FormHelper()
+ self.helper.form_tag = False
+
+ def clean_name(self):
+ name = self.cleaned_data['name']
+ return name.strip()
+
+ def clean(self):
+ cleaned_data = super().clean()
+ name = cleaned_data.get('name')
+ parent = cleaned_data.get('parent')
+
+ # Check name is unique in parent folder
+ args_id = []
+ if self.instance is not None:
+ args_id.append(~Q(id=self.instance.id))
+
+ if SubscriptionFolder.objects.filter(parent=parent, name__iexact=name, *args_id).count() > 0:
+ raise forms.ValidationError('A folder with the same name already exists in the given parent directory!', code='already_exists')
+
+ # Check for cycles
+ if self.instance is not None:
+ self.__test_cycles(parent)
+
+ def __test_cycles(self, new_parent):
+ visited = [self.instance.id]
+ current = new_parent
+ while current is not None:
+ if current.id in visited:
+ raise forms.ValidationError('Selected parent would create a parenting cycle!', code='parenting_cycle')
+ visited.append(current.id)
+ current = current.parent
+
+
+class CreateFolderModal(ModalMixin, CreateView):
+ template_name = 'YtManagerApp/controls/folder_create_modal.html'
+ form_class = SubscriptionFolderForm
+
+ def form_valid(self, form):
+ form.instance.user = self.request.user
+ return super().form_valid(form)
+
+
+class UpdateFolderModal(ModalMixin, UpdateView):
+ template_name = 'YtManagerApp/controls/folder_update_modal.html'
+ model = SubscriptionFolder
+ form_class = SubscriptionFolderForm
+
+
+class DeleteFolderModal(ModalMixin, DeleteView):
+ template_name = 'YtManagerApp/controls/folder_delete_modal.html'
+ model = SubscriptionFolder