Merge branch 'galleries-module'

sdebacker · May 9, 2014 · 85fbeb1 · 85fbeb1
2 parents 474eda6 + b34507d
commit 85fbeb1
Show file tree

Hide file tree

Showing 14 changed files with 148 additions and 74 deletions.
diff --git a/app/TypiCMS/Modules/Files/Controllers/Admin/FilesController.php b/app/TypiCMS/Modules/Files/Controllers/Admin/FilesController.php
@@ -33,14 +33,15 @@ public function index()
     {
         $allowedViews = ['index', 'filepicker', 'thumbnails', 'gallery'];
 
-        $page = Input::get('page');
-        $type = Input::get('type');
-        $view = Input::get('view', 'thumbnails');
-        $view = ! in_array($view, $allowedViews) ? 'thumbnails' : $view ;
+        $page       = Input::get('page');
+        $type       = Input::get('type');
+        $gallery_id = Input::get('gallery_id');
+        $view       = Input::get('view', 'thumbnails');
+        $view       = ! in_array($view, $allowedViews) ? 'thumbnails' : $view ;
 
         $itemsPerPage = Config::get('files::admin.itemsPerPage');
 
-        $data = $this->repository->byPageFrom($page, $itemsPerPage, null, array('translations'), true, $type);
+        $data = $this->repository->byPageFrom($page, $itemsPerPage, $gallery_id, array('translations'), true, $type);
 
         $models = Paginator::make($data->items, $data->totalItems, $itemsPerPage);
 

diff --git a/app/TypiCMS/Modules/Files/Repositories/CacheDecorator.php b/app/TypiCMS/Modules/Files/Repositories/CacheDecorator.php
@@ -23,24 +23,23 @@ public function __construct(FileInterface $repo, CacheInterface $cache)
      *
      * @param  int      $page  Number of models per page
      * @param  int      $limit Results per page
-     * @param  model    $from  related model
+     * @param  model    $gallery_id  related model
      * @param  boolean  $all   get published models or all
      * @param  array    $with  Eager load related models
      * @param  string   $type  file type : a,v,d,i,o
      * @return StdClass Object with $items and $totalItems for pagination
      */
-    public function byPageFrom($page = 1, $limit = 10, $from = null, array $with = array(), $all = false, $type = null)
+    public function byPageFrom($page = 1, $limit = 10, $gallery_id = null, array $with = array(), $all = false, $type = null)
     {
-        $fromKey = ($from) ? $from->id . get_class($from) : '' ;
         $cacheKey = md5(
-            App::getLocale() . 'byPageFrom' . $page . $limit . $fromKey . $all . implode(Input::except('page')) . $type
+            App::getLocale() . 'byPageFrom' . $page . $limit . $gallery_id . $all . implode(Input::except('page')) . $type
         );
 
         if ($this->cache->has($cacheKey)) {
             return $this->cache->get($cacheKey);
         }
 
-        $models = $this->repo->byPageFrom($page, $limit, $from, $with, $all, $type);
+        $models = $this->repo->byPageFrom($page, $limit, $gallery_id, $with, $all, $type);
 
         // Store in cache for next request
         $this->cache->put($cacheKey, $models);

diff --git a/app/TypiCMS/Modules/Files/Repositories/EloquentFile.php b/app/TypiCMS/Modules/Files/Repositories/EloquentFile.php
@@ -26,13 +26,13 @@ public function __construct(Model $model)
      *
      * @param  int      $page  Number of models per page
      * @param  int      $limit Results per page
-     * @param  model    $from  related model
+     * @param  model    $gallery_id  from witch gallery ?
      * @param  boolean  $all   get published models or all
      * @param  array    $with  Eager load related models
      * @param  string   $type  file type : a,v,d,i,o
      * @return StdClass Object with $items and $totalItems for pagination
      */
-    public function byPageFrom($page = 1, $limit = 10, $from = null, array $with = array(), $all = false, $type = null)
+    public function byPageFrom($page = 1, $limit = 10, $gallery_id = null, array $with = array(), $all = false, $type = null)
     {
         $result = new StdClass;
         $result->page = $page;
@@ -42,10 +42,14 @@ public function byPageFrom($page = 1, $limit = 10, $from = null, array $with = a
 
         $query = $this->make($with);
 
-        if ($type) {
+        if ($type) { // witch type of files to get (a,v,d,i,o) ?
             $query->where('type', $type);
         }
 
+        if ($gallery_id) {
+            $query->where('gallery_id', $gallery_id);
+        }
+
         $totalItems = $query->count();
 
         $query->order()

diff --git a/app/TypiCMS/Modules/Files/Repositories/FileInterface.php b/app/TypiCMS/Modules/Files/Repositories/FileInterface.php
@@ -9,13 +9,13 @@ interface FileInterface
      *
      * @param  int      $page  Number of models per page
      * @param  int      $limit Results per page
-     * @param  model    $from  related model
+     * @param  model    $gallery_id  related model
      * @param  array    $with  Eager load related models
      * @param  boolean  $all   get published models or all
      * @param  string   $type  file type : a,v,d,i,o
      * @return StdClass Object with $items and $totalItems for pagination
      */
-    public function byPageFrom($page = 1, $limit = 10, $from = null, array $with = array(), $all = false, $type = null);
+    public function byPageFrom($page = 1, $limit = 10, $gallery_id = null, array $with = array(), $all = false, $type = null);
 
     /**
      * Delete model

diff --git a/app/TypiCMS/Modules/Files/Views/files/admin/_form.blade.php b/app/TypiCMS/Modules/Files/Views/files/admin/_form.blade.php
@@ -49,18 +49,18 @@
 
     <div class="col-sm-6">
 
-        {{ Form::hidden('folder_id', 0) }}
-        {{ Form::hidden('gallery_id', Input::get('gallery_id', 0)) }}
-        {{ Form::hidden('user_id', 0) }}
+        {{ Form::hidden('folder_id', $model->folder_id ?: 0) }}
+        {{ Form::hidden('gallery_id', $model->gallery_id ?: 0) }}
+        {{ Form::hidden('user_id', $model->user_id ?: 0) }}
         {{ Form::hidden('type') }}
-        {{ Form::hidden('position', 0) }}
+        {{ Form::hidden('position', $model->position ?: 0) }}
         {{ Form::hidden('path') }}
         {{ Form::hidden('filename') }}
         {{ Form::hidden('extension') }}
         {{ Form::hidden('mimetype') }}
         {{ Form::hidden('width') }}
         {{ Form::hidden('height') }}
-        {{ Form::hidden('download_count', 0) }}
+        {{ Form::hidden('download_count', $model->download_count ?: 0) }}
 
         <div class="clearfix well media @if($errors->has('file'))has-error@endif">
             @if(isset($model->filename) and $model->filename)

diff --git a/app/TypiCMS/Modules/Files/Views/files/admin/filepicker.blade.php b/app/TypiCMS/Modules/Files/Views/files/admin/filepicker.blade.php
@@ -47,20 +47,16 @@ function selectAndClose(image) {
             @endforeach
 
             <div class="dropzone-previews clearfix sortable sortable-thumbnails">
-            @if (count($models))
-                @foreach ($models as $key => $model)
-                    <div class="thumbnail" id="item_{{ $model->id }}">
-                        {{ $model->present()->checkbox }}
-                        {{ $model->present()->thumb }}
-                        <div class="caption">
-                            <a href="#" class="btn btn-default btn-xs btn-block btn-insert" onclick="selectAndClose('/{{ $model->path }}{{ $model->filename }}')">@lang('files::global.Insert')</a>
-                            <small>{{ $model->filename }}</small>
-                        </div>
+            @foreach ($models as $key => $model)
+                <div class="thumbnail" id="item_{{ $model->id }}">
+                    {{ $model->present()->checkbox }}
+                    {{ $model->present()->thumb }}
+                    <div class="caption">
+                        <a href="#" class="btn btn-default btn-xs btn-block btn-insert" onclick="selectAndClose('/{{ $model->path }}{{ $model->filename }}')">@lang('files::global.Insert')</a>
+                        <small>{{ $model->filename }}</small>
                     </div>
-                @endforeach
-            @else
-                <p class="text-muted">@lang('global.No file')</p>
-            @endif
+                </div>
+            @endforeach
             </div>
             <div class="dz-message">@lang('files::global.Drop files to upload')</div>
 

diff --git a/app/TypiCMS/Modules/Files/Views/files/admin/gallery.blade.php b/app/TypiCMS/Modules/Files/Views/files/admin/gallery.blade.php
@@ -40,20 +40,16 @@
             @endforeach
 
             <div class="dropzone-previews clearfix sortable sortable-thumbnails">
-            @if (count($models))
-                @foreach ($models as $key => $model)
-                    <div class="thumbnail" id="item_{{ $model->id }}" href="{{ route('admin.files.edit', $model->id) }}">
-                        {{ $model->present()->checkbox }}
-                        {{ $model->present()->thumb }}
-                        <div class="caption">
-                            <small>{{ $model->present()->status }} {{ $model->filename }}</small>
-                            <div>{{ $model->alt_attribute }}</div>
-                        </div>
+            @foreach ($models as $key => $model)
+                <div class="thumbnail" id="item_{{ $model->id }}" href="{{ route('admin.files.edit', $model->id) }}">
+                    {{ $model->present()->checkbox }}
+                    {{ $model->present()->thumb }}
+                    <div class="caption">
+                        <small>{{ $model->present()->status }} {{ $model->filename }}</small>
+                        <div>{{ $model->alt_attribute }}</div>
                     </div>
-                @endforeach
-            @else
-                <p class="text-muted">@lang('global.No file')</p>
-            @endif
+                </div>
+            @endforeach
             </div>
             <div class="dz-message">@lang('files::global.Drop files to upload')</div>
 

diff --git a/app/TypiCMS/Modules/Galleries/Presenters/GalleryPresenter.php b/app/TypiCMS/Modules/Galleries/Presenters/GalleryPresenter.php
@@ -8,4 +8,19 @@
 class GalleryPresenter extends Presenter
 {
 
+    /**
+    * Files in list
+    *
+    * @return string
+    */
+    public function countFiles()
+    {
+        $nbFiles = count($this->entity->files);
+        $label = $nbFiles ? 'label-success' : 'label-default' ;
+        $html[] = '<span class="label ' . $label . '">';
+        $html[] = $nbFiles;
+        $html[] = '</span>';
+
+        return implode("\r\n", $html);
+    }
 }
diff --git a/app/TypiCMS/Modules/Galleries/Views/galleries/admin/_form.blade.php b/app/TypiCMS/Modules/Galleries/Views/galleries/admin/_form.blade.php
@@ -50,7 +50,12 @@
 
     </div>
 
-
-    <iframe class="col-sm-6" height="1000" src="/admin/files?view=gallery&amp;gallery_id={{ $model->id }}" frameborder="0"></iframe>
+    @if ($model->id)
+        <iframe class="col-sm-6" height="1000" src="/admin/files?view=gallery&amp;gallery_id={{ $model->id }}" frameborder="0"></iframe>
+    @else
+        <div class="col-sm-6">
+            <p class="alert alert-info">Create the gallery, then add files</p>
+        </div>
+    @endif
 
 </div>
diff --git a/app/TypiCMS/Modules/Menulinks/Views/menulinks/admin/_form.blade.php b/app/TypiCMS/Modules/Menulinks/Views/menulinks/admin/_form.blade.php
@@ -82,6 +82,6 @@
 </div>
 
 {{ Form::hidden('menu_id', $menu->id); }}
-{{ Form::hidden('position'); }}
-{{ Form::hidden('parent'); }}
+{{ Form::hidden('position', $model->position ?: 0); }}
+{{ Form::hidden('parent', $model->parent ?: 0); }}
 {{ Form::hidden('id'); }}
diff --git a/app/TypiCMS/Presenters/Presenter.php b/app/TypiCMS/Presenters/Presenter.php
@@ -82,23 +82,6 @@ public function titleAnchor()
         return '<a href="' . $url . '">' . $this->entity->title . '</a>';
     }
 
-    /**
-    * Files in list
-    *
-    * @return string
-    */
-    public function countFiles()
-    {
-        $nbFiles = count($this->entity->files);
-        $label = $nbFiles ? 'label-success' : 'label-default' ;
-        $url = route('admin.files.index', array('module' => $this->entity->getTable(), 'id' => $this->entity->id));
-        $html[] = '<a class="label ' . $label . '" href="' . $url . '">';
-        $html[] = $nbFiles;
-        $html[] = '</a>';
-
-        return implode("\r\n", $html);
-    }
-
     /**
      * Get the front end url from the current back end url
      * 
@@ -109,16 +92,21 @@ public function publicUri($lang)
     {
         $routeName = $lang . strstr(Route::current()->getName(), '.');
         $routeName = preg_replace('/\.edit$/', '.slug', $routeName);
-        // if model is translated and is online
+        // If model is translated and is online
         if (isset($this->entity->$lang->slug) and $this->entity->$lang->status) {
-            try {
+            try { // Does this public route exists ?
                 return route($routeName, $this->entity->$lang->slug);
             } catch (Exception $e) {
-                return $returnRoute = route('root');
+                return $lang;
             }
         }
+        // If model is offline or there is no translation
         $routeName = substr($routeName, 0, strrpos($routeName, '.'));
-        return route($routeName);
+        try { // Does this public route exists ?
+            return route($routeName);
+        } catch (Exception $e) {
+            return $lang;
+        }
     }
 
     /**

diff --git a/app/database/seeds/DatabaseSeeder.php b/app/database/seeds/DatabaseSeeder.php
@@ -22,6 +22,7 @@ public function run()
         $this->call('EventSeeder');
         $this->call('PlaceSeeder');
         $this->call('TranslationSeeder');
+        $this->call('GallerySeeder');
     }
 
 }