瀏覽代碼

minor fixes

Olivier Massot 11 月之前
父節點
當前提交
8e2c17e76a

+ 5 - 5
doc/be_users.md

@@ -44,10 +44,10 @@ Ce paragraphe présente les droits des be_users sur les pages et contenus du sit
 
 
 | Page                                               | Show               | Edit content       | Edit page          | Delete             | New                | Code |
 | Page                                               | Show               | Edit content       | Edit page          | Delete             | New                | Code |
 |----------------------------------------------------|--------------------|--------------------|--------------------|--------------------|--------------------|------|
 |----------------------------------------------------|--------------------|--------------------|--------------------|--------------------|--------------------|------|
-| Home                                               | ![v](images/v.svg) | ![v](images/v.svg) | ![x](images/x.svg) | ![x](images/x.svg) | ![x](images/x.svg) | *17* |
-| footer/* (mentions légales, contact, plan du site) | ![v](images/v.svg) | ![x](images/x.svg) | ![x](images/x.svg) | ![x](images/x.svg) | ![x](images/x.svg) | *1*  |
-| Menu Présentation (*)                              | ![v](images/v.svg) | ![x](images/x.svg) | ![x](images/x.svg) | ![x](images/x.svg) | ![x](images/x.svg) | *1*  |
-| Autres pages                                       | ![v](images/v.svg) | ![v](images/v.svg) | ![v](images/v.svg) | ![x](images/x.svg) | ![v](images/v.svg) | *27* |
+| Home                                               | ![v](images/v.svg) | ![v](images/v.svg) | ![v](images/v.svg) | ![x](images/x.svg) | ![v](images/v.svg) | *17* |
+| footer/* (mentions légales, contact, plan du site) | ![v](images/v.svg) | ![x](images/x.svg) | ![x](images/x.svg) | ![x](images/x.svg) | ![v](images/v.svg) | *1*  |
+| Menu Présentation (*)                              | ![v](images/v.svg) | ![x](images/x.svg) | ![v](images/v.svg) | ![x](images/x.svg) | ![v](images/v.svg) | *1*  |
+| Autres pages                                       | ![v](images/v.svg) | ![v](images/v.svg) | ![v](images/v.svg) | ![v](images/v.svg) | ![v](images/v.svg) | *27* |
 
 
 ### Licence Standard
 ### Licence Standard
 
 
@@ -64,7 +64,7 @@ Ce paragraphe présente les droits des be_users sur les pages et contenus du sit
 
 
 | Page                                               | Show               | Edit content       | Edit page          | Delete             | New                | Code |
 | Page                                               | Show               | Edit content       | Edit page          | Delete             | New                | Code |
 |----------------------------------------------------|--------------------|--------------------|--------------------|--------------------|--------------------|------|
 |----------------------------------------------------|--------------------|--------------------|--------------------|--------------------|--------------------|------|
-| Home                                               | ![v](images/v.svg) | ![v](images/v.svg) | ![x](images/x.svg) | ![x](images/x.svg) | ![x](images/x.svg) | *17* |
+| Home                                               | ![v](images/v.svg) | ![v](images/v.svg) | ![v](images/v.svg) | ![x](images/x.svg) | ![x](images/x.svg) | *17* |
 | footer/* (mentions légales, contact, plan du site) | ![v](images/v.svg) | ![x](images/x.svg) | ![x](images/x.svg) | ![x](images/x.svg) | ![x](images/x.svg) | *1*  |
 | footer/* (mentions légales, contact, plan du site) | ![v](images/v.svg) | ![x](images/x.svg) | ![x](images/x.svg) | ![x](images/x.svg) | ![x](images/x.svg) | *1*  |
 | Menu Présentation (*)                              | ![v](images/v.svg) | ![x](images/x.svg) | ![x](images/x.svg) | ![x](images/x.svg) | ![x](images/x.svg) | *1*  |
 | Menu Présentation (*)                              | ![v](images/v.svg) | ![x](images/x.svg) | ![x](images/x.svg) | ![x](images/x.svg) | ![x](images/x.svg) | *1*  |
 | Autres pages                                       | ![v](images/v.svg) | ![v](images/v.svg) | ![v](images/v.svg) | ![x](images/x.svg) | ![x](images/x.svg) | *19* |
 | Autres pages                                       | ![v](images/v.svg) | ![v](images/v.svg) | ![v](images/v.svg) | ![x](images/x.svg) | ![x](images/x.svg) | *19* |

+ 10 - 7
ot_admin/Classes/Controller/SiteController.php

@@ -39,7 +39,7 @@ class SiteController extends ActionController
     // Templates names
     // Templates names
     private const TEMPLATE_HOME = "OpenTalent.OtTemplating->home";
     private const TEMPLATE_HOME = "OpenTalent.OtTemplating->home";
     private const TEMPLATE_1COL = "OpenTalent.OtTemplating->1Col";
     private const TEMPLATE_1COL = "OpenTalent.OtTemplating->1Col";
-    private const TEMPLATE_3COL = "OpenTalent.OtTemplating->home";
+    private const TEMPLATE_3COL = "OpenTalent.OtTemplating->3Col";
     private const TEMPLATE_EVENTS = "OpenTalent.OtTemplating->events";
     private const TEMPLATE_EVENTS = "OpenTalent.OtTemplating->events";
     private const TEMPLATE_STRUCTURESEVENTS = "OpenTalent.OtTemplating->structuresEvents";
     private const TEMPLATE_STRUCTURESEVENTS = "OpenTalent.OtTemplating->structuresEvents";
     private const TEMPLATE_STRUCTURES = "OpenTalent.OtTemplating->structures";
     private const TEMPLATE_STRUCTURES = "OpenTalent.OtTemplating->structures";
@@ -405,7 +405,7 @@ class SiteController extends ActionController
             );
             );
 
 
             if ($isNetwork) {
             if ($isNetwork) {
-                // > 'Présentation > Les sociétés adhérentes' page
+                // > 'Présentation > Evènements des structures' page
                 $this->insertPage(
                 $this->insertPage(
                     $websiteUid,
                     $websiteUid,
                     $this->createdPagesIndex['/presentation'],
                     $this->createdPagesIndex['/presentation'],
@@ -1743,30 +1743,33 @@ class SiteController extends ActionController
         $pages = $this->otPageRepository->getPageWithSubpages($rootUid);
         $pages = $this->otPageRepository->getPageWithSubpages($rootUid);
 
 
         // To understand how the rights levels are computed:
         // To understand how the rights levels are computed:
-        // @see https://ressources.opentalent.fr/display/EX/Droits+des+BE+Users
+        // @see https://gitlab.2iopenservice.com/opentalent/ot_typo3/-/blob/master/doc/be_users.md?ref_type=heads
         foreach ($pages as $page) {
         foreach ($pages as $page) {
 
 
             if ($page['ot_page_type'] === OtPageTypeEnum::ROOT) {
             if ($page['ot_page_type'] === OtPageTypeEnum::ROOT) {
 
 
                 $adminPerms = self::PERM_SHOW + self::PERM_EDIT_CONTENT + self::PERM_EDIT_PAGE;
                 $adminPerms = self::PERM_SHOW + self::PERM_EDIT_CONTENT + self::PERM_EDIT_PAGE;
+                $editorsPerms = self::PERM_SHOW + self::PERM_EDIT_CONTENT + self::PERM_EDIT_PAGE;
                 if ($isPremium)  {
                 if ($isPremium)  {
                     $adminPerms += self::PERM_NEW;
                     $adminPerms += self::PERM_NEW;
+                    $editorsPerms += self::PERM_NEW;
                 }
                 }
-                $editorsPerms = self::PERM_SHOW + self::PERM_EDIT_CONTENT;
 
 
             } else if ($page['ot_page_type'] === OtPageTypeEnum::MANDATORY_NON_EDITABLE) {
             } else if ($page['ot_page_type'] === OtPageTypeEnum::MANDATORY_NON_EDITABLE) {
                 $adminPerms = self::PERM_SHOW;
                 $adminPerms = self::PERM_SHOW;
+                $editorsPerms = self::PERM_SHOW;
                 if ($isPremium)  {
                 if ($isPremium)  {
                     $adminPerms += self::PERM_NEW;
                     $adminPerms += self::PERM_NEW;
+                    $editorsPerms += self::PERM_NEW;
                 }
                 }
-                $editorsPerms = self::PERM_SHOW;
 
 
             } else if ($page['ot_page_type'] === OtPageTypeEnum::MANDATORY_EDITABLE) {
             } else if ($page['ot_page_type'] === OtPageTypeEnum::MANDATORY_EDITABLE) {
                 $adminPerms = self::PERM_SHOW;
                 $adminPerms = self::PERM_SHOW;
+                $editorsPerms = self::PERM_SHOW;
                 if ($isPremium)  {
                 if ($isPremium)  {
                     $adminPerms += self::PERM_NEW + self::PERM_EDIT_PAGE;
                     $adminPerms += self::PERM_NEW + self::PERM_EDIT_PAGE;
+                    $editorsPerms += self::PERM_NEW + self::PERM_EDIT_PAGE;
                 }
                 }
-                $editorsPerms = self::PERM_SHOW;
 
 
             } else {
             } else {
                 $adminPerms = self::PERM_SHOW + self::PERM_EDIT_CONTENT + self::PERM_EDIT_PAGE;
                 $adminPerms = self::PERM_SHOW + self::PERM_EDIT_CONTENT + self::PERM_EDIT_PAGE;
@@ -1776,7 +1779,7 @@ class SiteController extends ActionController
 
 
                 $editorsPerms = self::PERM_SHOW + self::PERM_EDIT_CONTENT + self::PERM_EDIT_PAGE;
                 $editorsPerms = self::PERM_SHOW + self::PERM_EDIT_CONTENT + self::PERM_EDIT_PAGE;
                 if ($isPremium)  {
                 if ($isPremium)  {
-                    $editorsPerms += self::PERM_NEW;
+                    $editorsPerms += self::PERM_DELETE + self::PERM_NEW;
                 }
                 }
             }
             }
 
 

+ 1 - 1
ot_connect/Classes/Service/OtAuthenticationService.php

@@ -357,7 +357,7 @@ class OtAuthenticationService extends AbstractAuthenticationService
         if ($isBackend) {
         if ($isBackend) {
             $user_row['lang'] = 'fr';
             $user_row['lang'] = 'fr';
             $user_row['options'] = "3";
             $user_row['options'] = "3";
-            $user_row['TSconfig'] = "options.uploadFieldsInTopOfEB = 1\noptions.defaultUploadFolder=1:user_upload/90214/";
+            $user_row['TSconfig'] = "options.uploadFieldsInTopOfEB = 1";
         } else {
         } else {
             $user_row['name'] = $userApiData['name'];
             $user_row['name'] = $userApiData['name'];
             $user_row['first_name'] = $userApiData['first_name'];
             $user_row['first_name'] = $userApiData['first_name'];

+ 1 - 0
ot_core/Classes/Service/OpentalentApiService.php

@@ -82,6 +82,7 @@ class OpentalentApiService
     ): array
     ): array
     {
     {
         $body = $this->getBody($uri, $params);
         $body = $this->getBody($uri, $params);
+
         $data = json_decode($body, true, 512, JSON_THROW_ON_ERROR);
         $data = json_decode($body, true, 512, JSON_THROW_ON_ERROR);
         if ($data !== null) {
         if ($data !== null) {
             return json_decode($body, true, 512, JSON_THROW_ON_ERROR);
             return json_decode($body, true, 512, JSON_THROW_ON_ERROR);