Merge pull request #46 from okulbilisim/master

merge
academic · Nov 29, 2014 · a47f4cf · a47f4cf
2 parents b64240a + 5e6c559
commit a47f4cf
Show file tree

Hide file tree

Showing 14 changed files with 115 additions and 39 deletions.
diff --git a/docs/developers/SampleData.md b/docs/developers/SampleData.md
@@ -0,0 +1,4 @@
+@todo 
+
+https://github.com/nelmio/alice
+https://github.com/fzaninotto/Faker
diff --git a/src/Ojs/CliBundle/Command/Jobs/CountJournalsForSubjectsCommand.php b/src/Ojs/CliBundle/Command/Jobs/CountJournalsForSubjectsCommand.php
@@ -27,6 +27,18 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $output->writeln("<info>Counting all journals grouped by Subjects</info>\n");
         $kernel = $this->getContainer()->get('kernel');
         $application = new \Symfony\Bundle\FrameworkBundle\Console\Application($kernel);
+
+        $doctrine = $this->getContainer()->get('doctrine');
+        $em = $doctrine->getManager();
+        $subjects = $em->getRepository('OjsJournalBundle:Subject')->findAll();
+
+        foreach ($subjects as $subject) {
+            $count = $subject->getJournals()->count();
+            $subject->setTotalJournalCount($count);
+            $em->persist($subject);
+            $em->flush();
+            echo ".";
+        }
         $application->setAutoExit(false);
     }
 

diff --git a/src/Ojs/CliBundle/Command/SampleDataCommand.php b/src/Ojs/CliBundle/Command/SampleDataCommand.php
@@ -22,6 +22,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $application = new \Symfony\Bundle\FrameworkBundle\Console\Application($kernel);
         $output->writeln('<info>Adding fake data</info>');
         $application->run(new \Symfony\Component\Console\Input\StringInput('h4cc_alice_fixtures:load:sets'));
+        $output->writeln('<info>Recalculating precalculated fields</info>');
+        $application->run(new \Symfony\Component\Console\Input\StringInput('ojs:count:journals:subjects'));
         $output->writeln("\nDONE\n");
     }
 

diff --git a/src/Ojs/JournalBundle/DataFixtures/Alice/JournalDefaultSet.php b/src/Ojs/JournalBundle/DataFixtures/Alice/JournalDefaultSet.php
@@ -40,5 +40,6 @@
 
 $set->addFile(__DIR__ . '/a_file.yml', 'yaml'); //Article File
 
+$set->addFile(__DIR__ . '/theme.yml', 'yaml'); //themes
 
 return $set;
diff --git a/src/Ojs/JournalBundle/DataFixtures/Alice/journal.yml b/src/Ojs/JournalBundle/DataFixtures/Alice/journal.yml
@@ -2,6 +2,7 @@
   journal{1..50}:
     issn: <regexify('\d{4}-\d{4}')>
     mission: <text(50)>
+    slug (unique): <domainWord()>
     period: <randomDigit(2)>
     published: '1'
     scope: <text(50)>
@@ -10,7 +11,7 @@
     titleAbbr: <text(5)>
     titleTransliterated: null
     url: <url()>
-    subdomain: <domainWord()>
+    subdomain (unique): <domainWord()>
     institution: @institution*
     subject: 5x @subject*
     status: '3'

diff --git a/src/Ojs/JournalBundle/DataFixtures/Alice/subject.yml b/src/Ojs/JournalBundle/DataFixtures/Alice/subject.yml
@@ -2,4 +2,4 @@
   subject{Anatomi ve Fizyoloji, Antropoloji,Askeri Tarih ve Bilim,Astronomi ve Astrofizik,Beslenme ve Diyetetik,Bilgi Teknolojileri,Bilgisayar Bilimleri,Biyografi,Biyoloji,Biyoteknoloji,Botanik,Çevre Bilimleri,Coğrafya ve Harita Bilimi,Dans,Denizbilim,Dil Bilimi,Din ve Felsefe,Diplomasi ve Uluslararası İlişkiler,Diş Hekimliği,Drama ve Sahne Sanatları,Eczacılık ve İlaç Bilimi,Edebiyat,Eğitim,Etnik ve Kültürel Çalışmalar,Fen Bilimleri,Film,Fizik,Fizik Tedavi ve Rehabilitasyon,Görsel Sanatlar,Güç ve Enerji,Halk Sağlığı,Hemşirelik ve Tamamlayıcı Sağlık Bilimleri,Hukuk,İktisat,İletişim ve Medya,İşletme ve Yönetim,Jeoloji,Kadın Çalışmaları ve Feminizm,Kimya,Kütüphane ve Enformasyon Bilimi,Madencilik ve Mineral Kaynakları,Matematik,Mimarlık,Mühendislik,Müzik,Ormancılık,Pazarlama,Politika ve Hükümet,Psikoloji,Sanat ve Eğlence,Siyaset Bilimi,Sosyal Çalışmalar,Sosyal ve Beşeri Bilimler,Sosyoloji,Spor Hekimliği,Spor ve Beden Eğitimi,Tamamlayıcı ve Alternatif Tıp,Tarih,Tarım ve Tarım Ticareti,Teknoloji,Tıp ve Sağlık Bilimleri,Tüketici Sağlığı,Uygulamalı Bilimler,Veterinerlik,Yapı ve İnşaat,Yaşam Bilimleri,Yer ve Atmosfer Bilimleri, Zooloji}:
     subject: <current()>
     createdBy: @user1->username
-    totalJournalCount: 0
+    totalJournalCount: <numberBetween(1,30)>
diff --git a/src/Ojs/JournalBundle/DataFixtures/Alice/theme.yml b/src/Ojs/JournalBundle/DataFixtures/Alice/theme.yml
@@ -0,0 +1,17 @@
+\Ojs\JournalBundle\Entity\Theme:
+  theme_notpublic1:
+    name: demo_theme1
+    title: Demo Theme 1
+    isPublic: false
+  theme_notpublic2:
+    name: demo_theme2
+    title: Demo Theme 2
+    isPublic: false
+  theme_public1:
+    name: demo_public_theme1
+    title: Demo Public Theme 1
+    isPublic: true
+  theme_public2:
+    name: demo_public_theme2
+    title: Demo Public Theme 2
+    isPublic: true
diff --git a/src/Ojs/JournalBundle/Entity/Journal.php b/src/Ojs/JournalBundle/Entity/Journal.php
@@ -120,6 +120,12 @@ class Journal extends \Ojs\Common\Entity\GenericExtendedEntity implements Transl
      */
     private $mission;
 
+    /**
+     * @var string
+     * @Expose
+     */
+    private $slug;
+
     /**
      * @var integer
      * @Expose
@@ -168,6 +174,7 @@ class Journal extends \Ojs\Common\Entity\GenericExtendedEntity implements Transl
      * @var \Doctrine\Common\Collections\Collection
      */
     private $pages;
+
     /**
      *
      * arbitrary settings
@@ -191,6 +198,7 @@ class Journal extends \Ojs\Common\Entity\GenericExtendedEntity implements Transl
      * @Expose
      */
     private $institutionId;
+
     /**
      * @var \Doctrine\Common\Collections\Collection
      */
@@ -246,8 +254,8 @@ public function getPages()
     public function removePage(\Ojs\WikiBundle\Entity\Page $page)
     {
         $this->pages->removeElement($page);
-
     }
+
     /**
      * @param  \Ojs\JournalBundle\Entity\JournalSection $section
      * @return Journal
@@ -274,7 +282,7 @@ public function getSections()
         return $this->sections;
     }
 
-     /**
+    /**
      * @param  \Ojs\JournalBundle\Entity\JournalTheme $journalTheme
      * @return Journal
      */
@@ -785,7 +793,30 @@ public function setMission($mission)
     }
 
     /**
-     * Get themeId
+     * Set slug
+     *
+     * @param  string $slug
+     * @return Journal
+     */
+    public function setSlug($slug)
+    {
+        $this->slug = $slug;
+
+        return $this;
+    }
+
+    /**
+     * Get slug
+     *
+     * @return string
+     */
+    public function getSlug()
+    {
+        return $this->slug;
+    }
+
+    /**
+     * Get theme
      *
      * @return integer
      */
@@ -989,5 +1020,4 @@ public function getBannedUsers()
         return $this->bannedUsers;
     }
 
-
 }
diff --git a/src/Ojs/JournalBundle/Form/JournalThemeType.php b/src/Ojs/JournalBundle/Form/JournalThemeType.php
@@ -25,7 +25,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'property' => 'title',
                     'query_builder' => function(\Doctrine\ORM\EntityRepository $er) {
                         return $er->createQueryBuilder('t')
-                                ->where('t.isPublic IS NULL OR t.isPublic = TRUE');
+                                ->where('t.isPublic = FALSE');
                     })
                 )
         ;

diff --git a/src/Ojs/JournalBundle/Form/JournalType.php b/src/Ojs/JournalBundle/Form/JournalType.php
@@ -40,6 +40,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 ->add('image')
                 ->add('scope')
                 ->add('mission')
+                ->add('slug')
                 ->add('themeId')
         ;
     }

diff --git a/src/Ojs/JournalBundle/Resources/config/doctrine/Journal.orm.yml b/src/Ojs/JournalBundle/Resources/config/doctrine/Journal.orm.yml
@@ -186,6 +186,9 @@ Ojs\JournalBundle\Entity\Journal:
             nullable: true
             gedmo:
                 - translatable
+        slug:
+            type: string
+            nullable: true
         themeId:
             type: integer
             column: theme_id
@@ -236,4 +239,7 @@ Ojs\JournalBundle\Entity\Journal:
         translation:
             locale: locale
         loggable: true
+    uniqueConstraints:
+        slugx:
+            columns: slug
     lifecycleCallbacks: {  }
diff --git a/src/Ojs/ManagerBundle/Resources/views/Admin/dashboard.html.twig b/src/Ojs/ManagerBundle/Resources/views/Admin/dashboard.html.twig
@@ -1,35 +1,37 @@
 {% extends "::ojsbase.html.twig" %}
 
 {% block body %}
-<h1>Admin Dashboard</h1>
-
-<div class="col-md-6">
-    <a href="{{path("dashboard_editor")}}"><strong>Editor Dashboard</strong></a>
-
-    <h2>Objects</h2>
-
-    <ul class="list-group">
-
-        <li class="list-group-item"><a href="{{path('article')}}">Articles</a></li>
-        <li class="list-group-item"><a href="{{path('author')}}">Authors</a></li>
-        <li class="list-group-item"><a href="{{path('contact')}}">Contacts</a></li>
-        <li class="list-group-item"><a href="{{path('contacttypes')}}">Contact Types</a></li>
-        <li class="list-group-item"><a href="{{path('institution')}}">Institutions</a></li>
-        <li class="list-group-item"><a href="{{path('institution_types')}}">Institution Types</a></li>
-        <li class="list-group-item"><a href="{{path('issue')}}">Issues</a></li>
-        <li class="list-group-item"><a href="{{path('journal')}}">Journals</a></li>
-        <li class="list-group-item"><a href="{{path('subject')}}">Subjects</a></li>
-        <li class="list-group-item"><a href="{{path('theme')}}">Themes</a></li>
-    </ul>
-</div>
-
-<div class="col-md-6">
-    <h2>System Operations</h2>
-    <ul class="list-group">
-        <li class="list-group-item"><a href="{{path('user')}}">User</a></li>
-        <li class="list-group-item"><a href="{{path('role')}}">Role</a></li>
-
-    </ul>
-</div>
+    <h1>Admin Dashboard</h1>
+
+    <div class="col-md-6">
+        <a href="{{path("dashboard_editor")}}"><strong>Editor Dashboard</strong></a>
+
+        <h2>Objects</h2>
+
+        <ul class="list-group">
+
+            <li class="list-group-item"><a href="{{path('article')}}">Articles</a></li>
+            <li class="list-group-item"><a href="{{path('author')}}">Authors</a></li>
+            <li class="list-group-item"><a href="{{path('contact')}}">Contacts</a></li>
+            <li class="list-group-item"><a href="{{path('contacttypes')}}">Contact Types</a></li>
+            <li class="list-group-item"><a href="{{path('institution')}}">Institutions</a></li>
+            <li class="list-group-item"><a href="{{path('institution_types')}}">Institution Types</a></li>
+            <li class="list-group-item"><a href="{{path('issue')}}">Issues</a></li>
+            <li class="list-group-item"><a href="{{path('journal')}}">Journals</a></li>
+            <li class="list-group-item"><a href="{{path('subject')}}">Subjects</a></li>
+            <li class="list-group-item"><a href="{{path('lang')}}">System Languages</a></li>
+            <li class="list-group-item"><a href="{{path('theme')}}">Themes</a></li>
+            <li class="list-group-item"><a href="{{path('admin_journaltheme')}}">Journal Themes</a></li>
+        </ul>
+    </div>
+
+    <div class="col-md-6">
+        <h2>System Operations</h2>
+        <ul class="list-group">
+            <li class="list-group-item"><a href="{{path('user')}}">Users</a></li>
+            <li class="list-group-item"><a href="{{path('role')}}">Roles</a></li>
+
+        </ul>
+    </div>
 
 {% endblock %}
diff --git a/src/Ojs/SiteBundle/Controller/SiteController.php b/src/Ojs/SiteBundle/Controller/SiteController.php
@@ -98,7 +98,7 @@ public function journalsIndexAction(Request $request, $page = 1)
         // TODO find only has journal(s) and count them
         $subjects = $em->getRepository('OjsJournalBundle:Subject')->findAll();
         foreach ($subjects as $subject) {
-            if ($subject->hasJournals()) {
+            if ($subject->getTotalJournalCount() > 0) {
                 $data["subjects"][] = $subject;
             }
         }

diff --git a/src/Ojs/SiteBundle/Resources/views/Site/journals_index.html.twig b/src/Ojs/SiteBundle/Resources/views/Site/journals_index.html.twig
@@ -39,7 +39,7 @@
                             {% for subject in subjects %}
                                 <li class="list-group-item">
                                     <a href="{{ path("ojs_journals_index",{page: currentPage,filters: addFilters('subject',subject.id)}) }}">{{subject.subject}}</a>
-                                    <span class="label label-success pull-right">{{subject.journals.count}}</span>
+                                    <span class="label label-success pull-right">{{subject.totalJournalCount}}</span>
                                 </li>
                             {% endfor %}
                         </ul>