app_data was reserved

changed to data_folder which is used as variable on application_info.py

Author: tlindi

rootfs/standard/var/www/mynode/api.py

@@ -150,7 +150,7 @@ def api_restart_app():
     return "OK"
 
 #    @mynode_api.route("/api/restart_app")
-@mynode_api.route("/api/backup_app_data")
+@mynode_api.route("/api/backup_data_folder")
 def api_backup_data_folder():
     check_logged_in()
 
@@ -185,7 +185,7 @@ def api_reset_data_folder():
         return "NO_APP_SPECIFIED"
     if not is_application_valid(app):
         return "INVALID_APP_NAME"
-    if not reset__data_folder(app):
+    if not reset_data_folder(app):
         return "ERROR"
     return "OK"
 

rootfs/standard/var/www/mynode/static/js/manage_apps.js

@@ -137,7 +137,7 @@ function backup_data_folder_via_api(name, short_name) {
     if ( confirm("Are you sure you want to backup "+name+"? This will stop, backup data and start app.") ) {
         $('#loading_spinner_message').html("Making backup...");
         $('#loading_spinner_overlay').fadeIn();
-        $.get('/api/backup_app_data?app='+short_name)
+        $.get('/api/backup_data_folder?app='+short_name)
             .done(function( data ) {
                 if (data != "OK") {
                     alert("Error backupping app data: "+data)
@@ -152,7 +152,7 @@ function restore_data_folder_via_api(name, short_name) {
     if ( confirm("Are you sure you want to restore "+name+"? This will stop, DELETE DATA, restore backup and start app.") ) {
         $('#loading_spinner_message').html("Restoring...");
         $('#loading_spinner_overlay').fadeIn();
-        $.get('/api/restore_app_data?app='+short_name)
+        $.get('/api/restore_data_folder?app='+short_name)
             .done(function( data ) {
                 if (data != "OK") {
                     alert("Error restoring app data: "+data)
@@ -167,7 +167,7 @@ function reset_data_folder_via_api(name, short_name) {
     if ( confirm("Are you sure you want to reset "+name+"? This will stop app, RESET ALL THE APP DATA and start app.") ) {
         $('#loading_spinner_message').html("Reseting app...");
         $('#loading_spinner_overlay').fadeIn();
-        $.get('/api/remove_app_data?app='+short_name)
+        $.get('/api/reset_data_folder?app='+short_name)
             .done(function( data ) {
                 if (data != "OK") {
                     alert("Error removing app data: "+data)

rootfs/standard/var/www/mynode/templates/app/generic_app.html

@@ -83,9 +83,9 @@
                             <button class="ui-button ui-widget ui-corner-all mynode_button app_page_button" onclick="restart_app_via_api('{{ app.name }}', '{{ app.short_name }}');">Restart</button>
 
                             {% if app.is_enabled and app.data_manageable %}
-                                <button class="ui-button ui-widget ui-corner-all mynode_button app_page_button" onclick="backup_app_data_via_api('{{ app.name }}', '{{ app.short_name }}');">Backup Data</button>
-                                <button class="ui-button ui-widget ui-corner-all mynode_button app_page_button" onclick="restore_app_data_via_api('{{ app.name }}', '{{ app.short_name }}');">Restore Data</button>
-                                <button class="ui-button ui-widget ui-corner-all mynode_button app_page_button" onclick="remove_app_data_via_api('{{ app.name }}', '{{ app.short_name }}');">Remove Data</button>
+                                <button class="ui-button ui-widget ui-corner-all mynode_button app_page_button" onclick="backup_data_folder_via_api('{{ app.name }}', '{{ app.short_name }}');">Backup Data</button>
+                                <button class="ui-button ui-widget ui-corner-all mynode_button app_page_button" onclick="restore_data_folder_via_api('{{ app.name }}', '{{ app.short_name }}');">Restore Data</button>
+                                <button class="ui-button ui-widget ui-corner-all mynode_button app_page_button" onclick="reset_data_folder_via_api('{{ app.name }}', '{{ app.short_name }}');">Reset Data</button>
                             {% endif %}
 
                             {% for btn in app.app_page_additional_buttons %}