Remove old server-side view

InvenTree/InvenTree/urls.py

@@ -42,8 +42,6 @@ from .views import CurrencyRefreshView
 from .views import AppearanceSelectView, SettingCategorySelectView
 from .views import DynamicJsView
 
-from common.views import SettingEdit, UserSettingEdit
-
 from .api import InfoView, NotFoundView
 from .api import ActionPluginView
 
@@ -85,9 +83,6 @@ settings_urls = [
 
     url(r'^category/', SettingCategorySelectView.as_view(), name='settings-category'),
 
-    url(r'^(?P<pk>\d+)/edit/user', UserSettingEdit.as_view(), name='user-setting-edit'),
-    url(r'^(?P<pk>\d+)/edit/', SettingEdit.as_view(), name='setting-edit'),
-
     # Catch any other urls
     url(r'^.*$', SettingsView.as_view(template_name='InvenTree/settings/settings.html'), name='settings'),
 ]

InvenTree/common/templates/common/edit_setting.html

@@ -1,14 +0,0 @@
-{% extends "modal_form.html" %}
-{% load i18n %}
-
-{% block pre_form_content %}
-
-{{ block.super }}
-<!--
-    <p>
-        <strong>{{ name }}</strong><br>
-        {{ description }}<br>
-        <em>{% trans "Current value" %}: {{ value }}</em>
-    </p>
--->
-{% endblock %}

InvenTree/common/views.py

@@ -8,138 +8,19 @@ from __future__ import unicode_literals
 import os
 
 from django.utils.translation import ugettext_lazy as _
-from django.forms import CheckboxInput, Select
 from django.conf import settings
 from django.core.files.storage import FileSystemStorage
 
 from formtools.wizard.views import SessionWizardView
 from crispy_forms.helper import FormHelper
 
-from InvenTree.views import AjaxUpdateView, AjaxView
+from InvenTree.views import AjaxView
 from InvenTree.helpers import str2bool
 
-from . import models
 from . import forms
 from .files import FileManager
 
 
-class SettingEdit(AjaxUpdateView):
-    """
-    View for editing an InvenTree key:value settings object,
-    (or creating it if the key does not already exist)
-    """
-
-    model = models.InvenTreeSetting
-    ajax_form_title = _('Change Setting')
-    form_class = forms.SettingEditForm
-    ajax_template_name = "common/edit_setting.html"
-
-    def get_context_data(self, **kwargs):
-        """
-        Add extra context information about the particular setting object.
-        """
-
-        ctx = super().get_context_data(**kwargs)
-
-        setting = self.get_object()
-
-        ctx['key'] = setting.key
-        ctx['value'] = setting.value
-        ctx['name'] = self.model.get_setting_name(setting.key)
-        ctx['description'] = self.model.get_setting_description(setting.key)
-
-        return ctx
-
-    def get_data(self):
-        """
-        Custom data to return to the client after POST success
-        """
-
-        data = {}
-
-        setting = self.get_object()
-
-        data['pk'] = setting.pk
-        data['key'] = setting.key
-        data['value'] = setting.value
-        data['is_bool'] = setting.is_bool()
-        data['is_int'] = setting.is_int()
-
-        return data
-
-    def get_form(self):
-        """
-        Override default get_form behaviour
-        """
-
-        form = super().get_form()
-
-        setting = self.get_object()
-
-        choices = setting.choices()
-
-        if choices is not None:
-            form.fields['value'].widget = Select(choices=choices)
-        elif setting.is_bool():
-            form.fields['value'].widget = CheckboxInput()
-
-            self.object.value = str2bool(setting.value)
-            form.fields['value'].value = str2bool(setting.value)
-
-        name = self.model.get_setting_name(setting.key)
-
-        if name:
-            form.fields['value'].label = name
-
-        description = self.model.get_setting_description(setting.key)
-
-        if description:
-            form.fields['value'].help_text = description
-
-        return form
-
-    def validate(self, setting, form):
-        """
-        Perform custom validation checks on the form data.
-        """
-
-        data = form.cleaned_data
-
-        value = data.get('value', None)
-
-        if setting.choices():
-            """
-            If a set of choices are provided for a given setting,
-            the provided value must be one of those choices.
-            """
-
-            choices = [choice[0] for choice in setting.choices()]
-
-            if value not in choices:
-                form.add_error('value', _('Supplied value is not allowed'))
-
-        if setting.is_bool():
-            """
-            If a setting is defined as a boolean setting,
-            the provided value must look somewhat like a boolean value!
-            """
-
-            if not str2bool(value, test=True) and not str2bool(value, test=False):
-                form.add_error('value', _('Supplied value must be a boolean'))
-
-
-class UserSettingEdit(SettingEdit):
-    """
-    View for editing an InvenTree key:value user  settings object,
-    (or creating it if the key does not already exist)
-    """
-
-    model = models.InvenTreeUserSetting
-    ajax_form_title = _('Change User Setting')
-    form_class = forms.SettingEditForm
-    ajax_template_name = "common/edit_setting.html"
-
-
 class MultiStepFormView(SessionWizardView):
     """ Setup basic methods of multi-step form