Skip to content

Commit 50ba280

Browse files
committed
Merge branch 'hotfix/1.3.1'
2 parents 1d90bee + 1222496 commit 50ba280

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.html linguist-language=python
2+
*.js linguist-language=python

adminlteui/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version = '1.3.0'
1+
version = '1.3.1'
22
default_app_config = 'adminlteui.apps.AdminlteUIConfig'

adminlteui/admin.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,9 @@ def exchange_menu_view(self, request):
237237
use_custom_menu = Options.objects.get(
238238
option_name='USE_CUSTOM_MENU')
239239
except Options.DoesNotExist:
240-
use_custom_menu = None
240+
use_custom_menu = Options.objects.create(
241+
option_name='USE_CUSTOM_MENU', option_value='0'
242+
)
241243

242244
if not use_custom_menu or use_custom_menu.option_value == '0':
243245
use_custom_menu.option_value = '1'

0 commit comments

Comments
 (0)