Finish some bug

apps/assets/models.py

@@ -242,7 +242,7 @@ class SystemUser(models.Model):
 
 class AssetGroup(models.Model):
     name = models.CharField(max_length=64, unique=True, verbose_name=_('Name'))
-    system_users = models.ManyToManyField(SystemUser, related_name='system_users', blank=True)
+    system_users = models.ManyToManyField(SystemUser, related_name='asset_groups', blank=True)
     created_by = models.CharField(max_length=32, blank=True, verbose_name=_('Created by'))
     date_created = models.DateTimeField(auto_now=True, null=True, verbose_name=_('Date added'))
     comment = models.TextField(blank=True, verbose_name=_('Comment'))

apps/users/models.py

@@ -40,7 +40,7 @@ class UserGroup(NoDeleteModelMixin):
         return True
 
     class Meta:
-        db_table = 'user-group'
+        db_table = 'user_group'
 
     @classmethod
     def initial(cls):

apps/users/templates/users/user_group_list.html

@@ -1,16 +1,11 @@
-<<<<<<< HEAD
+{% extends '_base_list.html' %}
-{% extends '_list_base.html' %}
 {% load i18n static %}
+{% load common_tags %}
 {% block custom_head_css_js %}
     <link href="{% static "css/plugins/sweetalert/sweetalert.css" %}" rel="stylesheet">
     <script src="{% static "js/plugins/sweetalert/sweetalert.min.js" %}"></script>
 {% endblock %}
 
-=======
-{% extends '_base_list.html' %}
-{% load i18n %}
-{% load common_tags %}
->>>>>>> asset
 {% block content_left_head %}
 <a href="{% url 'users:user-group-create' %}" class="btn btn-sm btn-primary ">{% trans "Add User Group" %}</a>
 {% endblock %}