修复构建仓库页面未正确应用权限设置的问题

openspug · Mar 31, 2023 · cdedc64 · cdedc64
1 parent 8f89e5a
commit cdedc64
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/spug_api/apps/repository/views.py b/spug_api/apps/repository/views.py
@@ -19,10 +19,10 @@ class RepositoryView(View):
     def get(self, request):
         apps = request.user.deploy_perms['apps']
         deploy_id = request.GET.get('deploy_id')
-        data = Repository.objects.annotate(
+        data = Repository.objects.filter(app_id__in=apps).annotate(
             app_name=F('app__name'),
             env_name=F('env__name'),
-            created_by_user=F('created_by__nickname')).filter(deploy_id__in=apps)
+            created_by_user=F('created_by__nickname'))
         if deploy_id:
             data = data.filter(deploy_id=deploy_id, status='5')
             return json_response([x.to_view() for x in data])

diff --git a/spug_web/src/pages/deploy/repository/index.js b/spug_web/src/pages/deploy/repository/index.js
@@ -57,11 +57,14 @@ export default observer(function () {
         </SearchForm.Item>
       </SearchForm>
       <ComTable/>
-      <AppSelector
-        visible={store.addVisible}
+      {store.addVisible && (
+        <AppSelector
+        visible
         filter={item => item.extend === '1'}
         onCancel={() => store.addVisible = false}
         onSelect={store.confirmAdd}/>
+      )}
+
       <Detail visible={store.detailVisible}/>
       {store.formVisible && <ComForm/>}
       {store.logVisible && <Console/>}