Skip to content

Commit 5ca3151

Browse files
committed
fix: update permission constants for document operations and adjust serializer field options
1 parent b11e339 commit 5ca3151

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

apps/common/constants/permission_constants.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,11 @@ class PermissionConstants(Enum):
220220
RoleConstants.USER])
221221
KNOWLEDGE_DELETE = Permission(group=Group.KNOWLEDGE, operate=Operate.DELETE, role_list=[RoleConstants.ADMIN,
222222
RoleConstants.USER])
223-
DOCUMENT_READ = Permission(group=Group.KNOWLEDGE, operate=Operate.DELETE, role_list=[RoleConstants.ADMIN,
223+
DOCUMENT_READ = Permission(group=Group.KNOWLEDGE, operate=Operate.READ, role_list=[RoleConstants.ADMIN,
224224
RoleConstants.USER])
225-
DOCUMENT_CREATE = Permission(group=Group.KNOWLEDGE, operate=Operate.DELETE, role_list=[RoleConstants.ADMIN,
225+
DOCUMENT_CREATE = Permission(group=Group.KNOWLEDGE, operate=Operate.CREATE, role_list=[RoleConstants.ADMIN,
226226
RoleConstants.USER])
227-
DOCUMENT_EDIT = Permission(group=Group.KNOWLEDGE, operate=Operate.DELETE, role_list=[RoleConstants.ADMIN,
227+
DOCUMENT_EDIT = Permission(group=Group.KNOWLEDGE, operate=Operate.EDIT, role_list=[RoleConstants.ADMIN,
228228
RoleConstants.USER])
229229
DOCUMENT_DELETE = Permission(group=Group.KNOWLEDGE, operate=Operate.DELETE, role_list=[RoleConstants.ADMIN,
230230
RoleConstants.USER])

apps/knowledge/serializers/document.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ class Query(serializers.Serializer):
184184
# 知识库id
185185
workspace_id = serializers.CharField(required=True, label=_('workspace id'))
186186
knowledge_id = serializers.UUIDField(required=True, label=_('knowledge id'))
187-
name = serializers.CharField(required=False, max_length=128, min_length=1, label=_('document name'))
187+
name = serializers.CharField(required=False, max_length=128, min_length=1, allow_null=True, allow_blank=True, label=_('document name'))
188188
hit_handling_method = serializers.CharField(required=False, label=_('hit handling method'))
189189
is_active = serializers.BooleanField(required=False, label=_('document is active'))
190190
task_type = serializers.IntegerField(required=False, label=_('task type'))
@@ -229,9 +229,8 @@ def get_query_set(self):
229229
'order_by_query': order_by_query_set
230230
}
231231

232-
def list(self, with_valid=False):
233-
if with_valid:
234-
self.is_valid(raise_exception=True)
232+
def list(self):
233+
self.is_valid(raise_exception=True)
235234
query_set = self.get_query_set()
236235
return native_search(query_set, select_string=get_file_content(
237236
os.path.join(PROJECT_DIR, "apps", "knowledge", 'sql', 'list_document.sql')))

0 commit comments

Comments
 (0)