cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

basic multiselect working

Browse Source
This commit is contained in:
vabene1111
2018-03-31 11:29:18 +02:00
parent 69e22c743a
commit eac41d6869
9 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/jsLibraryMappings.xml generated
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="JavaScriptLibraryMappings"> <component name="JavaScriptLibraryMappings">
<file url="file://$PROJECT_DIR$" libraries="{bootstrap, jquery-3.2.1.slim, popper}" /> <file url="file://$PROJECT_DIR$" libraries="{bootstrap, jquery-3.2.1, jquery-3.2.1.slim, jquery-3.3.1, popper}" />
</component> </component>
</project> </project>

4
.idea/recipes.iml generated
View File

@ -18,14 +18,14 @@
</content> </content>
<orderEntry type="jdk" jdkName="Python 3.6 (recipes)" jdkType="Python SDK" /> <orderEntry type="jdk" jdkName="Python 3.6 (recipes)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="jquery-3.1.1.slim" level="application" />
<orderEntry type="library" name="tether" level="application" />
<orderEntry type="library" name="bootstrap" level="application" /> <orderEntry type="library" name="bootstrap" level="application" />
<orderEntry type="library" name="jquery-3.2.1.slim" level="application" /> <orderEntry type="library" name="jquery-3.2.1.slim" level="application" />
<orderEntry type="library" name="popper" level="application" /> <orderEntry type="library" name="popper" level="application" />
<orderEntry type="library" name="jquery-3.2.1.slim" level="application" /> <orderEntry type="library" name="jquery-3.2.1.slim" level="application" />
<orderEntry type="library" name="popper" level="application" /> <orderEntry type="library" name="popper" level="application" />
<orderEntry type="library" name="bootstrap" level="application" /> <orderEntry type="library" name="bootstrap" level="application" />
<orderEntry type="library" name="jquery-3.2.1" level="application" />
<orderEntry type="library" name="jquery-3.3.1" level="application" />
</component> </component>
<component name="TemplatesService"> <component name="TemplatesService">
<option name="TEMPLATE_CONFIGURATION" value="Django" /> <option name="TEMPLATE_CONFIGURATION" value="Django" />

6
cookbook/forms.py
View File

@ -4,6 +4,8 @@ from django.utils.translation import gettext as _
from django import forms from django import forms
from .models import * from .models import *
from dal import autocomplete
class RecipeForm(forms.ModelForm): class RecipeForm(forms.ModelForm):
class Meta: class Meta:
@ -73,8 +75,8 @@ class EditRecipeForm(forms.ModelForm):
'path': _('Path'), 'path': _('Path'),
} }
help_texts = { widgets = {
'keywords': _('Ctrl+Click to select multiple keywords'), 'keywords': autocomplete.ModelSelect2Multiple(url='dal_keyword')
} }
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):

2
cookbook/helper/__init__.py
View File

@ -0,0 +1,2 @@
from cookbook.helper.dal import *
from cookbook.helper.dropbox import *

16
cookbook/helper/dal.py Normal file
View File

@ -0,0 +1,16 @@
from dal import autocomplete
from cookbook.models import Keyword
class KeywordAutocomplete(autocomplete.Select2QuerySetView):
def get_queryset(self):
if not self.request.user.is_authenticated:
return Keyword.objects.none()
qs = Keyword.objects.all()
if self.q:
qs = qs.filter(name__istartswith=self.q)
return qs

14
cookbook/templates/base.html
View File

@ -7,8 +7,9 @@
{% endblock %}</title> {% endblock %}</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous"> integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" <script
integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" src="https://code.jquery.com/jquery-3.3.1.min.js"
integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
crossorigin="anonymous"></script> crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"
integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
@ -18,7 +19,14 @@
crossorigin="anonymous"></script> crossorigin="anonymous"></script>
<style> <style>
@media (max-width:1025px) { .container { width: 95% !important; margin-left: 20px !important; margin-right: 20px !important;max-width: 1200px !important;} } @media (max-width: 1025px) {
.container {
width: 95% !important;
margin-left: 20px !important;
margin-right: 20px !important;
max-width: 1200px !important;
}
}
</style> </style>
</head> </head>
<body> <body>

3
cookbook/urls.py
View File

@ -2,6 +2,7 @@ from django.urls import path
from .views import * from .views import *
from cookbook.views import api from cookbook.views import api
from cookbook.helper import dal
urlpatterns = [ urlpatterns = [
path('', views.index, name='index'), path('', views.index, name='index'),
@ -30,5 +31,7 @@ urlpatterns = [
path('api/get_file_link/<int:recipe_id>/', api.get_file_link, name='api_get_file_link'), path('api/get_file_link/<int:recipe_id>/', api.get_file_link, name='api_get_file_link'),
path('api/sync_all/', api.dropbox_sync, name='api_dropbox_sync'), path('api/sync_all/', api.dropbox_sync, name='api_dropbox_sync'),
path('dal/keyword/', dal.KeywordAutocomplete.as_view(), name='dal_keyword'),
] ]

2
recipes/settings.py
View File

@ -33,6 +33,8 @@ MESSAGE_TAGS = {
# Application definition # Application definition
INSTALLED_APPS = [ INSTALLED_APPS = [
'dal',
'dal_select2',
'django.contrib.admin', 'django.contrib.admin',
'django.contrib.auth', 'django.contrib.auth',
'django.contrib.contenttypes', 'django.contrib.contenttypes',

4
requirements.txt
View File

@ -1,6 +1,8 @@
six
requests requests
django django
django-tables2 django-tables2
django-filter django-filter
django-crispy-forms django-crispy-forms
djangorestframework djangorestframework
django-autocomplete-light