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

[Update] 修改设置的一些require

pull/1043/head
ibuler 2018-02-27 15:04:05 +08:00
parent 9292e48554
commit 870b863136
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/templates/assets/asset_list.html
View File

@ -415,7 +415,7 @@ $(document).ready(function(){
current_node = nodes[0]; current_node = nodes[0];
url += "?node_id=" + current_node.id; url += "?node_id=" + current_node.id;
} }
window.open(url); window.open(url, '_self');
}) })
.on('click', '.btn_asset_delete', function () { .on('click', '.btn_asset_delete', function () {
var $this = $(this); var $this = $(this);

2
apps/common/forms.py
View File

@ -71,7 +71,7 @@ class BasicSettingForm(BaseForm):
help_text="eg: http://jumpserver.abc.com:8080" help_text="eg: http://jumpserver.abc.com:8080"
) )
USER_GUIDE_URL = forms.URLField( USER_GUIDE_URL = forms.URLField(
label=_("User Guide URL"), label=_("User Guide URL"), required=False,
help_text=_("User first login update profile done redirect to it") help_text=_("User first login update profile done redirect to it")
) )
EMAIL_SUBJECT_PREFIX = forms.CharField( EMAIL_SUBJECT_PREFIX = forms.CharField(

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

@ -151,6 +151,10 @@ class User(AbstractUser):
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
if not self.name: if not self.name:
self.name = self.username self.name = self.username
if self.username == 'admin':
self.role = 'Admin'
self.is_active = True
super().save(*args, **kwargs) super().save(*args, **kwargs)
@property @property