Skip to content

Commit e140e4b

Browse files
committed
refactor LabelsFiels into separate file
1 parent e19c99a commit e140e4b

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

finder/admin/folder.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ def get_model_admin(self, mime_type):
179179
def fetch_inodes(self, request, folder_id):
180180
if not (current_folder := self.get_object(request, folder_id)):
181181
return HttpResponseNotFound(f"Folder {folder_id} not found.")
182-
lookup = {}
183182
if search_query := request.GET.get('q'):
184183
inode_qs = self.search_for_inodes(request, current_folder, search_query)
185184
else:

finder/forms/fields.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import uuid
22

33
from django.forms.fields import UUIDField
4+
from django.forms.models import ModelMultipleChoiceField
45

56
from finder.forms.widgets import FinderFileSelect
67

@@ -16,3 +17,9 @@ def prepare_value(self, value):
1617
def to_python(self, value):
1718
value = super().to_python(value)
1819
return value
20+
21+
22+
class LabelsChoiceField(ModelMultipleChoiceField):
23+
def prepare_value(self, values):
24+
values = super().prepare_value(values)
25+
return [v for v in values if v] if hasattr(values, '__iter__') else values

finder/forms/file.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
from django.forms.fields import CharField
2-
from django.forms.models import ModelMultipleChoiceField
32
from django.forms.widgets import TextInput
43

54
from entangled.forms import EntangledModelForm
65

6+
from finder.forms.fields import LabelsChoiceField
77
from finder.models.file import FileModel
88
from finder.models.label import Label
99

1010

11-
class LabelsChoiceField(ModelMultipleChoiceField):
12-
def prepare_value(self, values):
13-
values = super().prepare_value(values)
14-
return [v for v in values if v] if hasattr(values, '__iter__') else values
15-
16-
1711
class FileForm(EntangledModelForm):
1812
name = CharField(
1913
widget=TextInput(attrs={'size': 100}),

finder/forms/widgets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import json
22

33
from django.core.serializers.json import DjangoJSONEncoder
4-
from django.forms.widgets import TextInput
4+
from django.forms.widgets import TextInput, SelectMultiple
55
from django.templatetags.static import static
66
from django.urls import reverse
77
from django.utils.html import format_html

0 commit comments

Comments
 (0)