Merge pull request #3426 from csordasmarton/show_edit_only_for_admins

[server][gui] Show edit option only for admins
Ericsson · Sep 8, 2021 · 1472cd9 · 1472cd9
2 parents 6892118 + f8fbbd4
commit 1472cd9
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 deletions.
diff --git a/web/server/codechecker_server/api/product_server.py b/web/server/codechecker_server/api/product_server.py
@@ -73,6 +73,18 @@ def __require_permission(self, required, args=None):
 
             return True
 
+    def __administrating(self, args):
+        """ True if the current user can administrate the given product. """
+        if permissions.require_permission(permissions.SUPERUSER, args,
+                                          self.__auth_session):
+            return True
+
+        if permissions.require_permission(permissions.PRODUCT_ADMIN, args,
+                                          self.__auth_session):
+            return True
+
+        return False
+
     def __get_product(self, session, product):
         """
         Retrieve the product connection object and create a Thrift Product
@@ -95,8 +107,6 @@ def __get_product(self, session, product):
                 'productID': product.id}
         product_access = permissions.require_permission(
             permissions.PRODUCT_VIEW, args, self.__auth_session)
-        product_admin = permissions.require_permission(
-            permissions.PRODUCT_ADMIN, args, self.__auth_session)
 
         admin_perm_name = permissions.PRODUCT_ADMIN.name
         admins = session.query(ProductPermission). \
@@ -119,7 +129,7 @@ def __get_product(self, session, product):
             latestStoreToProduct=latest_storage_date,
             connected=connected,
             accessible=product_access,
-            administrating=product_admin,
+            administrating=self.__administrating(args),
             databaseStatus=server_product.db_status,
             admins=[admin.name for admin in admins])
 

diff --git a/web/server/vue-cli/src/components/Report/ReportFilter/Filters/CleanupPlanFilter.vue b/web/server/vue-cli/src/components/Report/ReportFilter/Filters/CleanupPlanFilter.vue
@@ -15,6 +15,7 @@
     >
       <template v-slot:prepend-toolbar-items>
         <v-btn
+          v-if="currentProduct.administrating"
           class="manage-cleanup-plan-btn"
           icon
           small
@@ -34,6 +35,7 @@
 </template>
 
 <script>
+import { mapGetters } from "vuex";
 import { ccService, handleThriftError } from "@cc-api";
 
 import {
@@ -58,6 +60,12 @@ export default {
     };
   },
 
+  computed: {
+    ...mapGetters([
+      "currentProduct"
+    ])
+  },
+
   watch: {
     dialog(value) {
       if (value) return;

diff --git a/web/server/vue-cli/src/components/Report/ReportFilter/Filters/SourceComponentFilter.vue b/web/server/vue-cli/src/components/Report/ReportFilter/Filters/SourceComponentFilter.vue
@@ -16,6 +16,7 @@
     >
       <template v-slot:prepend-toolbar-items>
         <v-btn
+          v-if="currentProduct.administrating"
           class="manage-components-btn"
           icon
           small
@@ -49,6 +50,7 @@
 </template>
 
 <script>
+import { mapGetters } from "vuex";
 import { ccService, handleThriftError } from "@cc-api";
 
 import {
@@ -79,6 +81,12 @@ export default {
     };
   },
 
+  computed: {
+    ...mapGetters([
+      "currentProduct"
+    ])
+  },
+
   watch: {
     dialog(value) {
       if (value) return;

diff --git a/web/server/vue-cli/src/views/Products.vue b/web/server/vue-cli/src/views/Products.vue
@@ -110,7 +110,7 @@
       <template v-slot:item.action="{ item }">
         <div class="text-no-wrap">
           <edit-product-btn
-            v-if="isSuperUser || item.administrating"
+            v-if="item.administrating"
             :product="item"
             :is-super-user="isSuperUser"
             @on-complete="onCompleteEditProduct"