diff --git a/webfm/routes/Routes.py b/webfm/routes/Routes.py index 0c0a8d9..f809576 100644 --- a/webfm/routes/Routes.py +++ b/webfm/routes/Routes.py @@ -69,9 +69,8 @@ def getAllFavoritesRoute(): @app.route('/load-favorite', methods=['GET', 'POST'], subdomain='webfm') def loadFavorite(): if request.method == 'POST': - ID = str(request.values['id']).strip() try: - ID = int(ID) + ID = int(str(request.values['id']).strip()) fave = db.session.query(Favorites).filter_by(id=ID).first() file_manager.setNewPathFromFavorites(fave.link) file_manager.loadPreviousPath() @@ -90,19 +89,18 @@ def loadFavorite(): def manageFavoritesRoute(): if request.method == 'POST': ACTION = str(request.values['action']).strip() - PATH = str(request.values['path']).strip() + path = file_manager.getPath() if ACTION == "add": - fave = Favorites(link=PATH) + fave = Favorites(link=path) db.session.add(fave) - msg = "Added to Favorites successfully..." + msg = "Added to Favorites successfully..." else: - fave = db.session.query(Favorites).filter_by(link=PATH).first() + fave = db.session.query(Favorites).filter_by(link=path).first() db.session.delete(fave) - msg = "Deleted from Favorites successfully..." + msg = "Deleted from Favorites successfully..." db.session.commit() - return msgHandler.createMessageJSON("success", msg) else: msg = "Can't manage the request type..." diff --git a/webfm/static/js/ajax.js b/webfm/static/js/ajax.js index 9428c12..050db5d 100644 --- a/webfm/static/js/ajax.js +++ b/webfm/static/js/ajax.js @@ -13,8 +13,8 @@ const loadFavoriteLink = async (id) => { doAjax("load-favorite", data, "load-favorite"); } -const manageFavoritesAjax = async (action, path) => { - const data = "action=" + action + "&path=" + path; +const manageFavoritesAjax = async (action) => { + const data = "action=" + action; doAjax("manage-favorites", data, "manage-favorites"); } diff --git a/webfm/static/js/favorites.js b/webfm/static/js/favorites.js index 848cf0d..b4af23b 100644 --- a/webfm/static/js/favorites.js +++ b/webfm/static/js/favorites.js @@ -9,8 +9,7 @@ const manageFavorites = (elm) => { action = "add"; } - let path = document.getElementById("path").innerHTML; - manageFavoritesAjax(action, path); + manageFavoritesAjax(action); } diff --git a/webfm/static/js/post-ajax.js b/webfm/static/js/post-ajax.js index 62cca42..895b2d4 100644 --- a/webfm/static/js/post-ajax.js +++ b/webfm/static/js/post-ajax.js @@ -11,7 +11,6 @@ const postAjaxController = (data, action) => { generateFavesList(data.faves_list); if (data.hasOwnProperty("refresh")) { if (data.refresh == "true") { - console.log("here"); reloadDirectory(); } }