Rebase and rights checks

Author: AdrienClairembault

inc/category.class.php

@@ -35,13 +35,13 @@
 
 class PluginFormcreatorCategory extends CommonTreeDropdown
 {
-   static function canView() {
-      return Session::haveRight('ticket', CREATE);
-   }
-
    // Activate translation on GLPI 0.85
    var $can_be_translated = true;
 
+   static function canView() {
+      return parent::canView() || $_SESSION['glpiactiveprofile']['interface'] == 'helpdesk';
+   }
+
    public static function getTypeName($nb = 1) {
       return _n('Form category', 'Form categories', $nb, 'formcreator');
    }

inc/form.class.php

@@ -56,7 +56,7 @@ public static function canCreate() {
    }
 
    public static function canView() {
-      return Session::haveRight('ticket', CREATE);
+      return Session::haveRight('entity', UPDATE) || $_SESSION['glpiactiveprofile']['interface'] == 'helpdesk';
    }
 
    public static function canDelete() {