Skip to content

Commit

Permalink
Merge branch 'hotfix/1.3.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
wuyue92tree committed Jul 9, 2019
2 parents 1d90bee + 1222496 commit 50ba280
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.html linguist-language=python
*.js linguist-language=python
2 changes: 1 addition & 1 deletion adminlteui/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version = '1.3.0'
version = '1.3.1'
default_app_config = 'adminlteui.apps.AdminlteUIConfig'
4 changes: 3 additions & 1 deletion adminlteui/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,9 @@ def exchange_menu_view(self, request):
use_custom_menu = Options.objects.get(
option_name='USE_CUSTOM_MENU')
except Options.DoesNotExist:
use_custom_menu = None
use_custom_menu = Options.objects.create(
option_name='USE_CUSTOM_MENU', option_value='0'
)

if not use_custom_menu or use_custom_menu.option_value == '0':
use_custom_menu.option_value = '1'
Expand Down

0 comments on commit 50ba280

Please sign in to comment.