forked from Fediversity/Fediversity
FediPanel: fix deployment status
also remove unused `dummy_user`
This commit is contained in:
parent
2f55e1512a
commit
4dd1491e71
1 changed files with 1 additions and 17 deletions
|
@ -65,9 +65,6 @@ class ConfigurationForm(LoginRequiredMixin, APIView):
|
||||||
config.save()
|
config.save()
|
||||||
return redirect(self.success_url)
|
return redirect(self.success_url)
|
||||||
|
|
||||||
# TODO(@fricklerhandwerk):
|
|
||||||
# this is broken after changing the form view.
|
|
||||||
# but if there's no test for it, how do we know it ever worked in the first place?
|
|
||||||
class DeploymentStatus(ConfigurationForm):
|
class DeploymentStatus(ConfigurationForm):
|
||||||
|
|
||||||
def post(self, request):
|
def post(self, request):
|
||||||
|
@ -84,26 +81,13 @@ class DeploymentStatus(ConfigurationForm):
|
||||||
config.save()
|
config.save()
|
||||||
|
|
||||||
deployment_result, deployment_params = self.deployment(config.parsed_value)
|
deployment_result, deployment_params = self.deployment(config.parsed_value)
|
||||||
if deployment_result.returncode == 0:
|
|
||||||
deployment_status = "Deployment Succeeded"
|
|
||||||
else:
|
|
||||||
deployment_status = "Deployment Failed"
|
|
||||||
|
|
||||||
return render(self.request, "partials/deployment_result.html", {
|
return render(self.request, "partials/deployment_result.html", {
|
||||||
"deployment_status": deployment_status,
|
"deployment_succeeded": (deployment_result.returncode == 0),
|
||||||
"services": deployment_params.json(),
|
"services": deployment_params.json(),
|
||||||
})
|
})
|
||||||
|
|
||||||
def deployment(self, config: BaseModel):
|
def deployment(self, config: BaseModel):
|
||||||
# FIXME: let the user specify these from the form (#190)
|
|
||||||
dummy_user = {
|
|
||||||
"initialUser": {
|
|
||||||
"displayName": "Testy McTestface",
|
|
||||||
"username": "test",
|
|
||||||
"password": "testtest",
|
|
||||||
"email": "test@test.com",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
env = {
|
env = {
|
||||||
"PATH": settings.bin_path,
|
"PATH": settings.bin_path,
|
||||||
# pass in form info to our deployment
|
# pass in form info to our deployment
|
||||||
|
|
Loading…
Add table
Reference in a new issue