Some bugfixes.

Command/Dev/InitTestSchemaCommand.php

@@ -82,10 +82,18 @@ private function createSchema(OutputInterface $output)
 
         foreach ($this->getContainer()->get('kernel')->getBundles() as $bundle) {
             if ($bundle instanceof InstallableBundle && $bundle->hasMigrations()) {
+
                 if (count($migrator->getBundleStatus($bundle)[Migrator::STATUS_AVAILABLE]) > 1) {
                     $migrator->upgradeBundle($bundle, Migrator::VERSION_FARTHEST);
                 }
 
+                if ($bundle instanceof PluginBundle) {
+                    $this->getContainer()->get('claroline.plugin.installer')->install($bundle);
+                } elseif ($bundle instanceof InstallableInterface) {
+                    $this->getContainer()->get('claroline.installation.manager')->setLogger($consoleLogger);
+                    $this->getContainer()->get('claroline.installation.manager')->install($bundle, true);
+                }
+
                 if ($fixturesDir = $bundle->getRequiredFixturesDirectory($this->environment)) {
                     $output->writeln('Loading required fixtures...');
                     $fixtureLoader->load($bundle, $fixturesDir);

Entity/Organization/Organization.php

@@ -133,11 +133,7 @@ class Organization
     /**
      * @var User[]|ArrayCollection
      *
-     * @ORM\ManyToMany(
-     *     targetEntity="Claroline\CoreBundle\Entity\User",
-     *     inversedBy="administratedOrganizations"
-     * )
-     * @ORM\JoinTable(name="claro_user_administrator")
+     * @ORM\ManyToMany(targetEntity="Claroline\CoreBundle\Entity\User", mappedBy="administratedOrganizations")
      * @Groups({"api_organization_tree", "api_organization_list"})
      */
     protected $administrators;
@@ -244,17 +240,22 @@ public function getAdministrators()
 
     public function addAdministrator(User $user)
     {
-        if (!$this->administrators->contains($user)) $this->administrators->add($user);
+        if (!$this->administrators->contains($user)) {
+            $this->administrators->add($user);  
+            $user->addAdministratedOrganization($this);
+        } 
     }
 
     public function removeAdministrator(User $user)
     {
-        if ($this->administrators->contains($user)) $this->administrators->removeElement($user);
+        if ($this->administrators->contains($user)) {
+            $this->administrators->removeElement($user);
+            $user->removeAdministratedOrganization($this);
+        }
     }
 
     public function setAdministrators(ArrayCollection $users)
     {
-        var_dump('sett');
         $this->administrators = $users;
     }
 

Entity/User.php

@@ -401,10 +401,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
     protected $events;
 
     /**
-     * @ORM\ManyToMany(
-     *     targetEntity="Claroline\CoreBundle\Entity\Organization\Organization",
-     *     mappedBy="administrators"
-     * )
+     * @ORM\ManyToMany(targetEntity="Claroline\CoreBundle\Entity\Organization\Organization", inversedBy="administrators")
      * @ORM\JoinTable(name="claro_user_administrator")
      * @Groups({"api_user"})
      */
@@ -1164,12 +1161,12 @@ public function getOrganizations($includeGroups = true)
             }
         }
 
-        return array_unique(array_merge($organizations, $this->organizations->toArray()));
+        return array_merge($organizations, $this->organizations->toArray());
     }
 
     public function addOrganization(Organization $organization)
     {
-        $this->organizations->add($organization); 
+        if (!$this->organizations->contains($organization)) $this->organizations->add($organization); 
     }
 
     //sometimes it's passed as an array and I don't understand why.
@@ -1204,4 +1201,13 @@ public function addAdministratedOrganization(Organization $organization)
         $this->administratedOrganizations->add($organization); 
     }
 
+    public function removeAdministratedOrganization(Organization $organization)
+    {
+        $this->administratedOrganizations->remove($organization); 
+    }
+
+    public function setAdministratedOrganizations($organizations)
+    {
+        $this->administratedOrganizations = $organizations;
+    }
 }

Manager/GroupManager.php

@@ -466,8 +466,8 @@ public function searchPartialList($searches, $page, $limit, $count = false)
         if (!$this->container->get('security.authorization_checker')->isGranted('ROLE_ADMIN')) {
 
             $currentUser = $this->container->get('security.token_storage')->getToken()->getUser();
-            $qb->leftJoin('g.organizations', 'go');
-            $qb->leftJoin('go.administrators', 'ga');
+            $qb->join('g.organizations', 'go');
+            $qb->join('go.administrators', 'ga');
             $qb->andWhere('ga.id = :userId');
             $qb->setParameter('userId', $currentUser->getId());
         }

Manager/Organization/OrganizationManager.php

@@ -47,8 +47,14 @@ public function create(Organization $organization)
 
     public function edit(Organization $organization)
     {
-        //var_dump(count($organization->getAdministrators()));
-        //var_dump(count($organization->getLocations()));
+        //if I inverse the mappedBy and inversedBy doctrine mapping, I don't need to do this.
+        //but it it's done, the search request will break.
+        //no idea why
+        foreach ($organization->getAdministrators() as $administrator) {
+            $administrator->addOrganization($organization);
+            $this->om->persist($administrator);
+        }
+
         $this->om->persist($organization);
         $this->om->flush();
 

Manager/UserManager.php

@@ -1198,7 +1198,7 @@ public function updateImportedUsers(array $users, $additionalRoles = array())
                 $existingUser->setFirstName($firstName);
                 $existingUser->setLastName($lastName);
                 $existingUser->setUsername($username);
-                $existingUser->setPlainPassword($pwd);
+                if ($pwd != '') $existingUser->setPlainPassword($pwd);
                 $existingUser->setMail($email);
                 $existingUser->setAdministrativeCode($code);
                 $existingUser->setPhone($phone);

Resources/views/Workspace/layout.html.twig

@@ -2,10 +2,16 @@
 
 {% block title %}
     {% spaceless %}
-        {{ workspace.getName() }}
-    {% if _resource is defined %}
-        {{ _resource.getResourceNode().getName() | striptags | raw }}
-    {% endif %}
+        {% if workspace is defined %}
+            {{ workspace.getName() }}
+        {% else %}
+            {% if _resource is defined %}
+                {% if _resource.getWorkspace() %} 
+                    {{ _resource.getWorkspace.getName() }} -
+                {% endif %}
+                {{ _resource.getResourceNode().getName() | striptags | raw }}
+            {% endif %}
+        {% endif %}
     {% endspaceless %}
 {% endblock %}
 

Tests/API/User/GroupControllerTest.php

@@ -35,19 +35,24 @@ protected function setUp()
     {
         parent::setUp();
         $this->persister = $this->client->getContainer()->get('claroline.library.testing.persister');
+        //users
         $this->john = $this->persister->user('john');
         $roleAdmin = $this->persister->role('ROLE_ADMIN');
         $this->teacherRole = $this->persister->role('ROLE_TEACHER');
         $this->baseRole = $this->persister->role('ROLE_BASE');
         $this->admin = $this->persister->user('admin');
         $this->admin->addRole($roleAdmin);
+
+        //organization
         $organization = $this->persister->organization('organization');
         $this->adminOrga = $this->persister->user('adminOrga');
         $this->groupOrga = $this->persister->group('groupOrga');
         $this->groupOrga->addRole($this->baseRole);
         $this->groupBase = $this->persister->group('groupBase');
         $this->groupOrga->addOrganization($organization);
         $this->adminOrga->addAdministratedOrganization($organization);
+
+        //persist
         $this->persister->persist($this->groupOrga);
         $this->persister->persist($this->adminOrga);
         $this->persister->persist($this->admin);
@@ -99,15 +104,15 @@ public function testGetGroupActionIsProtected()
     //@method: POST
     public function testPostGroupAction()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }
 
     //@route: api_post_group
     //@url: /api/groups.{_format} 
     //@method: POST
     public function testPostGroupActionIsProtected()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }
 
 
@@ -116,15 +121,15 @@ public function testPostGroupActionIsProtected()
     //@method: PUT
     public function testPutGroupAction()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }
 
     //@route: api_put_group
     //@url: /api/groups/{group}.{_format} 
     //@method: PUT
     public function testPutGroupActionIsProtected()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }
 
     //@route: api_delete_group

Tests/API/User/UserControllerTest.php

@@ -55,12 +55,6 @@ protected function setUp()
         $this->persister->flush();
     }
 
-    private function initGroup()
-    {
-        $this->group = $this->persister->group('group');
-        //Do more stuff here. Yolo.
-    }
-
     //@url: /api/users.{_format}  
     //@route: api_get_users
     public function testGetUsersAction()
@@ -81,7 +75,6 @@ public function testGetUsersActionIsSecured()
         $this->assertEquals(403, $this->client->getResponse()->getStatusCode());
     }
 
-
     //@url: /api/searches/{page}/users/{limit}.{_format}
     //@route: api_get_search_users
     public function testGetSearchUsersAction()
@@ -343,30 +336,30 @@ public function testRemoveUserRoleActionIsProtected()
     //@url: /api/users/{user}/groups/{group}/add.{_format} 
     public function testAddUserGroupAction()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }
 
 
     //@route: api_add_user_group
     //@url: /api/users/{user}/groups/{group}/add.{_format} 
     public function testAddUserGroupActionIsProtected()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }    
 
 
     //@route: api_remove_user_group
     //@url: /api/users/{user}/groups/{group}/remove.{_format}
     public function testRemoveUserGroupAction()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }
 
     //@route: api_remove_user_group
     //@url: /api/users/{user}/groups/{group}/remove.{_format}
     public function testRemoveUserGroupActionIsProtected()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }