diff --git a/plogical/applicationInstaller.py b/plogical/applicationInstaller.py index a2439c477..17aa3a262 100755 --- a/plogical/applicationInstaller.py +++ b/plogical/applicationInstaller.py @@ -1647,7 +1647,7 @@ $parameters = array( import json tempStatusPath = self.data['tempStatusPath'] statusFile = open(tempStatusPath, 'w') - statusFile.writelines('Creating Website...') + statusFile.writelines('Creating Website...,10') statusFile.close() @@ -1677,7 +1677,7 @@ $parameters = array( break elif lastLine.find('[404]') > -1: statusFile = open(currentTemp, 'w') - statusFile.writelines('Failed to Create Website: error: %s[404]' % lastLine) + statusFile.writelines('Failed to Create Website: error: %s. [404]' % lastLine) statusFile.close() return 0 else: @@ -1687,7 +1687,7 @@ $parameters = array( time.sleep(2) statusFile = open(tempStatusPath, 'w') - statusFile.writelines('Installing WordPress....') + statusFile.writelines('Installing WordPress....,30') statusFile.close() ## Install WordPress diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js index 7e090f7ba..65e373f92 100755 --- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js +++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js @@ -310,12 +310,14 @@ app.controller('createWordpress', function ($scope, $http, $timeout, $compile, $ getCreationStatus(); } else { - - // $scope.errorMessage = response.data.error_message; - alert("Status not = 1: Error..." + response.data.error_message) + $scope.goBackDisable = false; + new PNotify({ + title: 'Operation Failed!', + text: response.data.error_message, + type: 'error' + }); } - } function cantLoadInitialDatas(response) { diff --git a/websiteFunctions/templates/websiteFunctions/WPConfigurePlugins.html b/websiteFunctions/templates/websiteFunctions/WPConfigurePlugins.html index 48560847b..8ef3a1a19 100644 --- a/websiteFunctions/templates/websiteFunctions/WPConfigurePlugins.html +++ b/websiteFunctions/templates/websiteFunctions/WPConfigurePlugins.html @@ -10,70 +10,88 @@

{% trans "Configure Plugins" %}

- {% trans "Add New Plugin" %} + {% trans "Create New Bucket" %} +

{% trans "You can configure list of plugins that will automatically get installed while deploying WordPress." %}

-

List of Saved Plugins Bucket

- - - - - +
+
+

+ {% trans "Plugin Buckets" %} +

+
-
+ + + + + + + + + - - + + - - {% for sub in Selectedplugins %} + + {% for sub in Selectedplugins %} - - + - - + + + + - - {% endfor %} + + {% endfor %} - - + + + + + +
+ + @@ -81,21 +99,21 @@ diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py index f5223d15b..c155bec6c 100755 --- a/websiteFunctions/website.py +++ b/websiteFunctions/website.py @@ -168,8 +168,6 @@ class WebsiteManager: userobj = Administrator.objects.get(pk=userID) - - Selectedplugins = wpplugins.objects.filter(owner = userobj) #data['Selectedplugins'] = wpplugins.objects.filter(ProjectOwner=HostingCompany) @@ -1051,7 +1049,6 @@ class WebsiteManager: extraArgs['home'] = "1" extraArgs['tempStatusPath'] = "/home/cyberpanel/" + str(randint(1000, 9999)) - background = ApplicationInstaller('wordpressInstallNew', extraArgs) background.start() @@ -2798,7 +2795,7 @@ class WebsiteManager: return HttpResponse(json_data) elif lastLine.find('[404]') > -1: data_ret = {'abort': 1, 'installStatus': 0, 'installationProgress': "0", - 'error_message': lastLine} + 'error_message': ProcessUtilities.outputExecutioner("cat " + statusFile).splitlines()} json_data = json.dumps(data_ret) return HttpResponse(json_data) else: