Add all settings to appsettings page & Convert settings choices

accounts/forms.py

@@ -9,8 +9,7 @@ class UserAddForm(forms.Form):
     name = forms.CharField(label="Name",
                            error_messages={'required': _('No User name has been entered')},
                            max_length=20)
-    password = forms.CharField(required=not settings.ALLOW_EMPTY_PASSWORD,
-                               error_messages={'required': _('No password has been entered')},)
+    password = forms.CharField(required=not settings.ALLOW_EMPTY_PASSWORD, error_messages={'required': _('No password has been entered')},)
 
     def clean_name(self):
         name = self.cleaned_data['name']

accounts/migrations/0003_auto_20200604_0930.py

@@ -0,0 +1,24 @@
+# Generated by Django 2.2.12 on 2020-06-04 09:30
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0002_permissionset'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userattributes',
+            name='max_cpus',
+            field=models.IntegerField(default=2, help_text='-1 for unlimited. Any integer value', validators=[django.core.validators.MinValueValidator(-1)]),
+        ),
+        migrations.AlterField(
+            model_name='userattributes',
+            name='max_instances',
+            field=models.IntegerField(default=2, help_text='-1 for unlimited. Any integer value', validators=[django.core.validators.MinValueValidator(-1)]),
+        ),
+    ]

accounts/models.py

@@ -1,4 +1,3 @@
-from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.validators import MinValueValidator
 from django.db import models

accounts/templates/accounts-list.html

@@ -68,8 +68,8 @@
                                 <div class="modal-content">
                                     <form method="post" role="form" aria-label="Edit user form">{% csrf_token %}
                                         <div class="modal-header">
-                                            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                                             <h5 class="modal-title">{% trans "Edit user info" %}</h5>
+                                            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                                         </div>
                                         <div class="modal-body">
                                             <div class="form-group row">
@@ -133,11 +133,11 @@
                                                 {% trans "Delete" %}
                                             </button>
                                             {% if user.is_active %}
-                                                <button type="submit" class="float-left btn btn-warning" name="block">
+                                                <button type="submit" class="btn btn-warning mr-auto" name="block">
                                                     {% trans "Block" %}
                                                 </button>
                                             {% else %}
-                                                <button type="submit" class="float-left btn btn-success" name="unblock">
+                                                <button type="submit" class="btn btn-success mr-auto" name="unblock">
                                                     {% trans "Unblock" %}
                                                 </button>
                                             {% endif %}

accounts/urls.py

@@ -1,4 +1,4 @@
-from django.urls import path, re_path
+from django.urls import path
 from django.contrib.auth import views as auth_views
 from . import views
 

accounts/views.py

@@ -4,10 +4,10 @@ from django.http import HttpResponseRedirect
 from django.shortcuts import render
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
-
 from accounts.forms import UserAddForm
 from accounts.models import *
 from admin.decorators import superuser_only
+from appsettings.models import AppSettings
 from instances.models import Instance
 
 import sass
@@ -22,7 +22,6 @@ def profile(request):
     error_messages = []
     # user = User.objects.get(id=request.user.id)
     publickeys = UserSSHKey.objects.filter(user_id=request.user.id)
-
     themes_list = os.listdir(settings.SCSS_DIR +"/wvc-theme")
 
     if request.method == 'POST':
@@ -69,20 +68,6 @@ def profile(request):
             delkeypublic = UserSSHKey.objects.get(id=keyid)
             delkeypublic.delete()
             return HttpResponseRedirect(request.get_full_path())
-        if 'change_theme' in request.POST:
-            theme = request.POST.get('theme_select', '')
-            scss_var = f"@import '{settings.SCSS_DIR}/wvc-theme/{theme}/variables';"
-            scss_bootswatch = f"@import '{settings.SCSS_DIR}/wvc-theme/{theme}/bootswatch';"       
-            scss_boot = f"@import '{settings.SCSS_DIR}/bootstrap-overrides.scss';"
-                          
-            with open(settings.SCSS_DIR + "/wvc-main.scss", "w") as main:
-                main.write(scss_var + "\n" + scss_boot + "\n" + scss_bootswatch)
-            
-            css_compressed = sass.compile(string=scss_var + "\n"+ scss_boot + "\n" + scss_bootswatch, output_style='compressed')
-            with open("static/" + "css/wvc-main.min.css", "w") as css:
-                css.write(css_compressed)
-            
-            return HttpResponseRedirect(request.get_full_path())
     return render(request, 'profile.html', locals())
 
 
@@ -119,8 +104,8 @@ def account(request, user_id):
             return HttpResponseRedirect(request.get_full_path())
         if 'add' in request.POST:
             inst_id = request.POST.get('inst_id', '')
-
-            if settings.ALLOW_INSTANCE_MULTIPLE_OWNER:
+            
+            if AppSettings.objects.get(key="ALLOW_INSTANCE_MULTIPLE_OWNER").value == 'True':
                 check_inst = UserInstance.objects.filter(instance_id=int(inst_id), user_id=int(user_id))
             else:
                 check_inst = UserInstance.objects.filter(instance_id=int(inst_id))