fix #1003 @1

diff --git a/framework/application/controllers/MaintenanceController.php b/framework/application/controllers/MaintenanceController.php
index 09e206f1460ad2252c9175c10545e86c4944ce25..53e1ba1f4d0e5f4851ecd779f5fb627fd8afc0eb 100644 (file)
--- a/framework/application/controllers/MaintenanceController.php
+++ b/framework/application/controllers/MaintenanceController.php
@@ -8,16 +8,16 @@ class MaintenanceController extends CubeIT_Controller_MaintenanceController {
                return $url;
        }
 
-//     public function featuredCategories() {
-//             $references = Fluidbook_Model_Reference::factory()->find();
-//             foreach ($references as $reference) {
-//                     if ($reference->getFeatured()) {
-//                             $reference->setFeaturedCategories($reference->getCategories());
-//                     }
-//                     fb($reference->toArray());
-//                     $reference->save();
-//             }
-//     }
+       //      public function featuredCategories() {
+       //              $references = Fluidbook_Model_Reference::factory()->find();
+       //              foreach ($references as $reference) {
+       //                      if ($reference->getFeatured()) {
+       //                              $reference->setFeaturedCategories($reference->getCategories());
+       //                      }
+       //                      fb($reference->toArray());
+       //                      $reference->save();
+       //              }
+       //      }
 
        public function importReferences() {
                set_time_limit(0);
@@ -37,14 +37,22 @@ class MaintenanceController extends CubeIT_Controller_MaintenanceController {
                }
                $fluidbooks = array_values(array_unique($fluidbooks));
 
+               $n = 0;
+
                foreach ($fluidbooks as $fluidbook) {
-                       $meta = $ws->getMetadata($fluidbook);
-                       $dir = PUBLIC_PATH . '/references/' . $fluidbook . '-' . CubeIT_Text::str2URL($meta->title);
+                       if ($n > 5) {
+                               break;
+                       }
                        try {
-                               $ws->installBookIfNeeded($fluidbook, $dir, $meta->date);
+                               $meta = $ws->getMetadata($fluidbook);
+                               $dir = PUBLIC_PATH . '/references/' . $fluidbook . '-' . CubeIT_Text::str2URL(trim($meta->title));
+
+
                        } catch (exception $e) {
+
                        }
 
+
                }
        }
 }

diff --git a/framework/application/forms/CMS/Sub/Exemples/Fluidbook.php b/framework/application/forms/CMS/Sub/Exemples/Fluidbook.php
index caa3af1e9a88f251309fb31c15d4f57ec62b1fa8..44f64318e6f26350f115df32ab336512fc8876cf 100644 (file)
--- a/framework/application/forms/CMS/Sub/Exemples/Fluidbook.php
+++ b/framework/application/forms/CMS/Sub/Exemples/Fluidbook.php
@@ -55,7 +55,7 @@ class Fluidbook_Form_CMS_Sub_Exemples_Fluidbook extends CubeIT_Form_List_Model {
                        ->setEditTitle('Edition de l\'exemple « $title »')\r
                        ->setModel('Fluidbook_Model_Reference')\r
                        ->setTitleColumn("title")\r
-                       ->setAdditionnalColumns(array('fluidbook_id', 'featured', 'homeimage', 'date'))\r
+                       ->setAdditionnalColumns(array('fluidbook_id', 'featured', 'homeimage','url', 'date'))\r
                        ->setSearchColumns(array('text', 'fluidbook_id', 'title'));\r
        }\r
 \r

diff --git a/framework/application/models/Reference.php b/framework/application/models/Reference.php
index 39b9156f9359ee5b086416e97c847dea657e76e0..19296a81b822e99bb6f97d618a713eedc704745c 100644 (file)
--- a/framework/application/models/Reference.php
+++ b/framework/application/models/Reference.php
@@ -57,13 +57,19 @@ class Fluidbook_Model_Reference extends CubeIT_Model_Data_Table {
        }\r
 \r
        protected function _getFinalURL($url, $locale = null) {\r
+               $prepend = '';\r
                if ($url) {\r
-                       return $url;\r
+                       if (substr($url, 0, 1) == '#') {\r
+                               $prepend = $url;\r
+                       } else {\r
+                               return $url;\r
+                       }\r
+\r
                }\r
                if (null === $locale) {\r
-                       return $this->_getLocalReference($this->getFluidbookId());\r
+                       return $this->_getLocalReference($this->getFluidbookId()) . $prepend;\r
                } else {\r
-                       return $this->_getLocalReference($this->getFluidbookId()->$locale);\r
+                       return $this->_getLocalReference($this->getFluidbookId()->$locale) . $prepend;\r
                }\r
        }\r
 \r