Etienne Pallier / labinvent

Commit b7f0fc55a2126cd3c339e50297e365dd6bc5e07b

Authored by Etienne Pallier
1 parent f084c88b
Exists in master and in 3 other branches dev, dev-IRAP, dev-LATMOS

bugfix du bugfix...

Showing 14 changed files with 17 additions and 16 deletions   Show diff stats
Inline Side-by-side
src/Controller/AppController.php
  Diff comments   View file @b7f0fc5
... ... @@ -99,7 +99,7 @@ class AppController extends Controller {
99 99 * Autorisations fréquentes utilisées par bcp de isAuthorized() de controlleurs
100 100 * Ca évite de répéter 10 fois la meme chose !!!
101 101 */
102   - public function isAuthorizedCommons() {
  102 + public function isAuthorizedCommons($user) {
103 103 $action = $this->getActionPassed();
104 104 //$role = $this->getUserRole($user);
105 105  
... ... @@ -111,7 +111,8 @@ class AppController extends Controller {
111 111 }
112 112  
113 113 // By default
114   - return parent::isAuthorized($user);
  114 + //return parent::isAuthorized($user);
  115 + return AppController::isAuthorized($user);
115 116 }
116 117  
117 118 /**
... ...
src/Controller/CategoriesController.php
  Diff comments   View file @b7f0fc5
... ... @@ -59,7 +59,7 @@ class CategoriesController extends AppController
59 59 //return false;
60 60 //return parent::isAuthorized($user);
61 61  
62   - return $this->isAuthorizedCommons();
  62 + return $this->isAuthorizedCommons($user);
63 63 }
64 64  
65 65 /**
... ...
src/Controller/FournisseursController.php
  Diff comments   View file @b7f0fc5
... ... @@ -51,7 +51,7 @@ class FournisseursController extends AppController
51 51 //return false;
52 52 //return parent::isAuthorized($user);
53 53  
54   - return $this->isAuthorizedCommons();
  54 + return $this->isAuthorizedCommons($user);
55 55  
56 56 }
57 57  
... ...
src/Controller/GroupesMetiersController.php
  Diff comments   View file @b7f0fc5
... ... @@ -58,7 +58,7 @@ class GroupesMetiersController extends AppController
58 58 //return false;
59 59 //return parent::isAuthorized($user);
60 60  
61   - return $this->isAuthorizedCommons();
  61 + return $this->isAuthorizedCommons($user);
62 62  
63 63 }
64 64  
... ...
src/Controller/GroupesThematiquesController.php
  Diff comments   View file @b7f0fc5
... ... @@ -49,7 +49,7 @@ class GroupesThematiquesController extends AppController
49 49 // Par défaut
50 50 //return false;
51 51 //return parent::isAuthorized($user);
52   - return $this->isAuthorizedCommons();
  52 + return $this->isAuthorizedCommons($user);
53 53 }
54 54  
55 55  
... ...
src/Controller/OrganismesController.php
  Diff comments   View file @b7f0fc5
... ... @@ -55,7 +55,7 @@ class OrganismesController extends AppController
55 55 // Par défaut
56 56 //return false;
57 57 //return parent::isAuthorized($user);
58   - return $this->isAuthorizedCommons();
  58 + return $this->isAuthorizedCommons($user);
59 59 }
60 60  
61 61 /**
... ...
src/Controller/SitesController.php
  Diff comments   View file @b7f0fc5
... ... @@ -45,7 +45,7 @@ class SitesController extends AppController
45 45 */
46 46  
47 47 //return false;
48   - return $this->isAuthorizedCommons();
  48 + return $this->isAuthorizedCommons($user);
49 49 }
50 50  
51 51  
... ...
src/Controller/SousCategoriesController.php
  Diff comments   View file @b7f0fc5
... ... @@ -46,7 +46,7 @@ class SousCategoriesController extends AppController
46 46  
47 47 return false;
48 48 */
49   - return $this->isAuthorizedCommons();
  49 + return $this->isAuthorizedCommons($user);
50 50 }
51 51  
52 52  
... ...
src/Controller/SurCategoriesController.php
  Diff comments   View file @b7f0fc5
... ... @@ -45,7 +45,7 @@ class SurCategoriesController extends AppController
45 45  
46 46 return false;
47 47 */
48   - return $this->isAuthorizedCommons();
  48 + return $this->isAuthorizedCommons($user);
49 49 }
50 50  
51 51  
... ...
src/Controller/TypeDocumentsController.php
  Diff comments   View file @b7f0fc5
... ... @@ -41,7 +41,7 @@ class TypeDocumentsController extends AppController
41 41  
42 42 return false;
43 43 */
44   - return $this->isAuthorizedCommons();
  44 + return $this->isAuthorizedCommons($user);
45 45 }
46 46  
47 47  
... ...
src/Controller/TypeSuivisController.php
  Diff comments   View file @b7f0fc5
... ... @@ -41,7 +41,7 @@ class TypeSuivisController extends AppController
41 41  
42 42 return false;
43 43 */
44   - return $this->isAuthorizedCommons();
  44 + return $this->isAuthorizedCommons($user);
45 45 }
46 46  
47 47  
... ...
src/Controller/UnitesController.php
  Diff comments   View file @b7f0fc5
... ... @@ -40,7 +40,7 @@ class UnitesController extends AppController
40 40  
41 41 return false;
42 42 */
43   - return $this->isAuthorizedCommons();
  43 + return $this->isAuthorizedCommons($user);
44 44 }
45 45  
46 46  
... ...
src/Model/Table/LdapConnectionsTable.php
  Diff comments   View file @b7f0fc5
... ... @@ -269,8 +269,8 @@ class LdapConnectionsTable extends AppTable {
269 269 // => il a donc le role "Utilisateur" PAR DEFAUT
270 270 private function getTheFakeLdapUser() {
271 271 return [
272   - 'login' => '_ldap_user_',
273   - 'pass' => '_ldap_user_pass',
  272 + 'login' => '_fake_ldap_user_',
  273 + 'pass' => '_fake_ldap_user_pass',
274 274 ];
275 275 }
276 276 public function ldapAuthentication($login, $password) {
... ...
tests/TestCase/Controller/General.php
  Diff comments   View file @b7f0fc5
... ... @@ -320,7 +320,7 @@ class General extends IntegrationTestCase {
320 320 }
321 321 public function authUtilisateurFromLdap() {
322 322 //$this->authUser('_NouvelUtilisateur_username', 'NOUVEL', 'UTILISATEUR');
323   - $this->authUser('_ldap_user_', 'FAKE_LDAP', 'UTILISATEUR');
  323 + $this->authUser('_fake_ldap_user_', 'FAKE_LDAP', 'UTILISATEUR');
324 324 }
325 325 /*
326 326 $user = [
... ...