github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Finish some bug

pull/530/head
ibuler 2016-09-20 01:13:50 +08:00
parent ce5950ca73
commit 220892824c
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/models.py
View File

@ -242,7 +242,7 @@ class SystemUser(models.Model):
class AssetGroup(models.Model): class AssetGroup(models.Model):
name = models.CharField(max_length=64, unique=True, verbose_name=_('Name')) 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')) 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')) date_created = models.DateTimeField(auto_now=True, null=True, verbose_name=_('Date added'))
comment = models.TextField(blank=True, verbose_name=_('Comment')) comment = models.TextField(blank=True, verbose_name=_('Comment'))

2
apps/users/models.py
View File

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

9
apps/users/templates/users/user_group_list.html
View File

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