Merge pull request #1413 from longguikeji/v2.5-dev

feat: 🎸 获取插件接口添加是否启用字段
longguikeji · Nov 18, 2022 · 0b688f3 · 0b688f3
2 parents f6ee86b + 30758bb
commit 0b688f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/api/v1/views/arkstore.py b/api/v1/views/arkstore.py
@@ -305,7 +305,7 @@ class ArkstoreAppQueryIn(Schema):
 
 
 @api.get("/tenant/{tenant_id}/arkstore/extensions/", tags=['方舟商店'], response=List[OnShelveExtensionPurchaseOut])
-@operation(List[ArkstoreItemSchemaOut], roles=[TENANT_ADMIN, PLATFORM_ADMIN])
+@operation(List[ArkstoreItemSchemaOut], roles=[TENANT_ADMIN, PLATFORM_ADMIN, NORMAL_USER])
 @paginate(ArstoreExtensionPagination)
 def list_arkstore_extensions(request, tenant_id: str, query_data: ArkstoreExtensionQueryIn=Query(...)):
     query_data = query_data.dict()
@@ -329,7 +329,7 @@ def list_arkstore_private_apps(request, tenant_id: str, query_data: ArkstoreAppQ
 
 
 @api.get("/tenant/{tenant_id}/arkstore/categorys/", tags=['方舟商店'], response=ArkstoreCategoryListSchemaOut)
-@operation(roles=[TENANT_ADMIN, PLATFORM_ADMIN])
+@operation(roles=[TENANT_ADMIN, PLATFORM_ADMIN,NORMAL_USER])
 def list_arkstore_categorys(request, tenant_id: str, parent_id:str = None, type:str = 'app', show_local:int = 0):
     '''
     方舟商店分类列表
@@ -445,7 +445,7 @@ class ArkstoreStatusFilterIn(Schema):
     )
 
 @api.get("/tenant/{tenant_id}/arkstore/purchased_and_installed/extensions/", tags=['方舟商店'], response=List[OnShelveExtensionPurchaseOut])
-@operation(List[ArkstoreItemSchemaOut], roles=[TENANT_ADMIN, PLATFORM_ADMIN])
+@operation(List[ArkstoreItemSchemaOut], roles=[TENANT_ADMIN, PLATFORM_ADMIN,NORMAL_USER])
 @paginate(CustomPagination)
 def list_arkstore_purchased_and_installed_extensions(request, tenant_id: str, filter: ArkstoreStatusFilterIn=Query(...)):
     extra_params = {}

diff --git a/api/v1/views/extension.py b/api/v1/views/extension.py
@@ -202,7 +202,7 @@ def list_extensions(request, query_data: ExtensionListQueryIn=Query(...)):
 class ExtensionItemOut(ModelSchema):
     class Config:
         model=ExtensionModel
-        model_fields=['id','type',"package","name"]
+        model_fields=['id','type',"package","name","is_active"]
 
 class ExtensionOut(ResponseSchema):
     data:ExtensionItemOut