Merge pull request #12 from okulbilisim/master

merge
academic · Nov 10, 2014 · 258c6c1 · 258c6c1
2 parents 3b8a254 + cf3b7ae
commit 258c6c1
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/src/Ojs/Common/Listener/UserListener.php b/src/Ojs/Common/Listener/UserListener.php
@@ -48,14 +48,14 @@ public function loadJournalRoles()
     {
         $user = $this->checkUser();
 
+        if (!$user || !$this->session->get('selectedJournalId')) {
+            return;
+        }
         //for API_KEY based connection
         if($user instanceof \Symfony\Component\Security\Core\User\User){
             $user = $this->container->get('doctrine')->getManager()->getRepository('OjsUserBundle:User')->findOneBy(['username'=>$user->getUsername()]);
         }
 
-        if (!$user || !$this->session->get('selectedJournalId')) {
-            return;
-        }
         $em = $this->container->get('doctrine')->getManager();
         $repo = $em->getRepository('OjsUserBundle:UserJournalRole');
         $entities = $repo->findBy(array('userId' => $user->getId(), 'journalId' => $this->session->get('selectedJournalId')));
@@ -76,7 +76,7 @@ public function loadClientUsers()
     {
         $user = $this->checkUser();
         if (!$user) {
-            throw new UsernameNotFoundException("User not found.");
+            return;
         }
 
         //for API_KEY based connection
@@ -99,7 +99,7 @@ public function loadJournals()
         /** @var User $user */
         $user = $this->checkUser();
         if (!$user) {
-            throw new UsernameNotFoundException("User not found.");
+            return;
         }
 
         //for API_KEY based connection

diff --git a/src/Ojs/JournalBundle/DataFixtures/ORM/LoadInstitutionData.php b/src/Ojs/JournalBundle/DataFixtures/ORM/LoadInstitutionData.php
@@ -9,6 +9,7 @@
 
 class LoadInstitutionData extends AbstractFixture implements OrderedFixtureInterface
 {
+
     public function load(ObjectManager $manager)
     {
         $institution = new Institution();
@@ -19,12 +20,13 @@ public function load(ObjectManager $manager)
         $institution->setAbout("About Abc University");
         $institution->setPhone("+90 312 555 5555");
         $manager->persist($institution);
+        $this->addReference('ref-institution', $institution);
         $manager->flush();
     }
 
     public function getOrder()
     {
-        return 4;
+        return 5;
     }
 
 }
diff --git a/src/Ojs/JournalBundle/DataFixtures/ORM/LoadInstitutionTypesData.php b/src/Ojs/JournalBundle/DataFixtures/ORM/LoadInstitutionTypesData.php
@@ -9,6 +9,7 @@
 
 class LoadInstitutionTypesData extends AbstractFixture implements OrderedFixtureInterface
 {
+
     public function load(ObjectManager $manager)
     {
         $itype = new InstitutionTypes();
@@ -21,12 +22,14 @@ public function load(ObjectManager $manager)
         $itype2->setDescription("Demo intsitution desc.");
         $manager->persist($itype2);
 
+        $this->addReference('ref-institution-type-1', $itype);
+        $this->addReference('ref-institution-type-2', $itype2);
         $manager->flush();
     }
 
     public function getOrder()
     {
-        return 5;
+        return 4;
     }
 
 }
diff --git a/src/Ojs/JournalBundle/DataFixtures/ORM/LoadJournalData.php b/src/Ojs/JournalBundle/DataFixtures/ORM/LoadJournalData.php
@@ -13,6 +13,8 @@ public function load(ObjectManager $manager)
     {
         $languages = $manager->getRepository('OjsJournalBundle:Lang')->findAll();
 
+        $institution = $this->getReference('ref-institution');
+
         $journal = new Journal();
         $journal->setIssn("1300-7041");
         $journal->setMission("Mission text");
@@ -25,6 +27,7 @@ public function load(ObjectManager $manager)
         $journal->setTitleTransliterated(null);
         $journal->setUrl("https://app.ojs.io");
         $journal->setSubdomain("local");
+        $journal->setInstitution($institution);
         $manager->persist($journal);
 
         $journal2 = new Journal();
@@ -39,6 +42,8 @@ public function load(ObjectManager $manager)
         $journal2->setTitleTransliterated(null);
         $journal2->setUrl("https://example2.edu");
         $journal2->setSubdomain("demo2");
+        $journal2->setInstitution($institution);
+
         $manager->persist($journal2);
 
         /* @var $lang  \Ojs\JournalBundle\Entity\Lang */

diff --git a/src/Ojs/JournalBundle/Entity/Journal.php b/src/Ojs/JournalBundle/Entity/Journal.php
@@ -533,7 +533,7 @@ public function getUrl()
      * @param  int  $institutionId
      * @return Journal
      */
-    public function setInstitutioId($institutionId)
+    public function setInstitutionId($institutionId)
     {
         $this->institutionId = $institutionId;
         return $this;
@@ -555,7 +555,7 @@ public function getInstitutionId()
      */
     public function setInstitution($institution)
     {
-        $this->institutionId = $institution;
+        $this->institution = $institution;
         return $this;
     }