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

[Copyright] 修改copyrite

pull/828/merge
ibuler 2017-11-23 14:35:16 +08:00
parent e7f38ec894
commit 26607bc327
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/perms/templates/perms/asset_permission_list.html
View File

@ -7,7 +7,6 @@
{% endblock %} {% endblock %}
{% block table_head %} {% block table_head %}
<th class="text-center">{% trans 'ID' %}</th>
<th class="text-center">{% trans 'Name' %}</th> <th class="text-center">{% trans 'Name' %}</th>
<th class="text-center">{% trans 'User' %}</th> <th class="text-center">{% trans 'User' %}</th>
<th class="text-center">{% trans 'User group' %}</th> <th class="text-center">{% trans 'User group' %}</th>
@ -21,7 +20,6 @@
{% block table_body %} {% block table_body %}
{% for asset_permission in asset_permission_list %} {% for asset_permission in asset_permission_list %}
<tr class="gradeX"> <tr class="gradeX">
<td class="text-center">{{ asset_permission.id }}</td>
<td class="text-center"> <td class="text-center">
<a href="{% url 'perms:asset-permission-detail' pk=asset_permission.id %}"> <a href="{% url 'perms:asset-permission-detail' pk=asset_permission.id %}">
{{ asset_permission.name }} {{ asset_permission.name }}

2
apps/templates/_footer.html
View File

@ -4,6 +4,6 @@
<img style="display: none" src="http://www.jumpserver.org/img/evaluate_avatar1.jpg"> <img style="display: none" src="http://www.jumpserver.org/img/evaluate_avatar1.jpg">
</div> </div>
<div> <div>
<strong>Copyright</strong> Jumpserver.org Team &copy; 2014-2017 <strong>Copyright</strong> 北京堆栈科技有限公司 &copy; 2014-2017
</div> </div>
</div> </div>

3
apps/users/models/user.py
View File

@ -43,8 +43,7 @@ class User(AbstractUser):
_public_key = models.CharField(max_length=5000, blank=True, verbose_name=_('ssh public key')) _public_key = models.CharField(max_length=5000, blank=True, verbose_name=_('ssh public key'))
comment = models.TextField(max_length=200, blank=True, verbose_name=_('Comment')) comment = models.TextField(max_length=200, blank=True, verbose_name=_('Comment'))
is_first_login = models.BooleanField(default=False) is_first_login = models.BooleanField(default=False)
date_expired = models.DateTimeField(default=date_expired_default, blank=True, null=True, date_expired = models.DateTimeField(default=date_expired_default, blank=True, null=True, verbose_name=_('Date expired'))
verbose_name=_('Date expired'))
created_by = models.CharField(max_length=30, default='', verbose_name=_('Created by')) created_by = models.CharField(max_length=30, default='', verbose_name=_('Created by'))
@property @property