Passing filterOpts along to APIs and modal. #1341

photo · Oct 24, 2013 · 0b8c8a4 · 0b8c8a4
1 parent 1e0ddad
commit 0b8c8a4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/src/html/assets/themes/fabrizio1.0/config/settings.ini b/src/html/assets/themes/fabrizio1.0/config/settings.ini
@@ -1,5 +1,5 @@
 [site]
-mediaVersion="do"
+mediaVersion="dp"
 
 [behavior]
 useDefaultMobile="0"

diff --git a/src/html/assets/themes/fabrizio1.0/javascripts/fabrizio.js b/src/html/assets/themes/fabrizio1.0/javascripts/fabrizio.js
@@ -354,6 +354,7 @@
               routes: {
                 "p/:id": "photoModal",
                 "p/:id/*path": "photoModal",
+                "p/:id?*path": "photoModal",
                 "photos/list": "photosList",
                 "photos/*path/list": "photosList"
               },

diff --git a/src/html/assets/themes/fabrizio1.0/javascripts/op/Lightbox.js b/src/html/assets/themes/fabrizio1.0/javascripts/op/Lightbox.js
@@ -110,7 +110,8 @@
       //toggleDetails :[68]   // d
     },
 
-    _path: location.pathname+location.search,
+    _path: location.pathname,
+    _pathWithQuery: location.pathname+location.search,
     _filter: location.pathname.replace('/p/', '/').replace('/photos/', '/').replace('/list', ''),
     _query: location.search || '',
     _visible: false,
@@ -240,7 +241,7 @@
       this._visible = false;
       if(this.$el)
         this.$el.fadeOut('fast');
-      router.navigate(this._path, {silent:true});
+      router.navigate(this._pathWithQuery, {silent:true});
       return this;
     },
 
@@ -443,7 +444,6 @@
       model = op.data.store.Photos.get(id);
 
       if( !model ) return $.error('No image in store with id '+id);
-
       return this.update(model).show();
     }
   });

diff --git a/src/libraries/controllers/ApiPhotoController.php b/src/libraries/controllers/ApiPhotoController.php
@@ -191,7 +191,7 @@ public function nextPrevious($id, $filterOpts = null)
     {
       foreach($photos as $innerKey => $photo)
       {
-        $nextPrevious[$topKey][$innerKey] = $this->photo->addApiUrls($photo, $sizes);
+        $nextPrevious[$topKey][$innerKey] = $this->photo->addApiUrls($photo, $sizes, null, $filterOpts);
         if(!$this->user->isAdmin() && $this->config->site->decreaseLocationPrecision === '1')
         {
           if(isset($nextPrevious[$topKey][$innerKey]['latitude']))
@@ -299,7 +299,7 @@ public function list_($filterOpts = null)
     // we also can't pass in $photo since it doesn't persist over iterations and removes returnSizes
     foreach($photos as $key => $photo)
     {
-      $photos[$key] = $this->photo->addApiUrls($photos[$key], $sizes, $tokenValue);
+      $photos[$key] = $this->photo->addApiUrls($photos[$key], $sizes, $tokenValue, $filterOpts);
       if(!$this->user->isAdmin() && $this->config->site->decreaseLocationPrecision === '1')
       {
         if(isset($photos[$key]['latitude']))
@@ -826,7 +826,7 @@ public function view($id, $options = null)
       }
     }
 
-    $photo = $this->photo->addApiUrls($photo, $sizes, $tokenValue);
+    $photo = $this->photo->addApiUrls($photo, $sizes, $tokenValue, $options);
     if(!$this->user->isAdmin() && $this->config->site->decreaseLocationPrecision === '1')
     {
       if(isset($photo['latitude']))

diff --git a/src/libraries/controllers/PhotoController.php b/src/libraries/controllers/PhotoController.php
@@ -200,7 +200,7 @@ public function list_($filterOpts = null)
     $photoCount = empty($photos) ? 0 : $photos[0]['totalRows'];
     $currentSortParts = (array)explode(',', $params['_GET']['sortBy']);
     $currentSortBy = $params['_GET']['sortBy'];
-    $headingHelper = $this->theme->get($this->utility->getTemplate('partials/photos-sub-heading.php'), array('isAlbum' => $isAlbum, 'currentSortBy' => $currentSortBy, 'sortParts' => $currentSortParts, 'photoCount' => $photoCount));
+    $headingHelper = $this->theme->get($this->utility->getTemplate('partials/photos-sub-heading.php'), array('isAlbum' => $isAlbum, 'album' => $album, 'currentSortBy' => $currentSortBy, 'sortParts' => $currentSortParts, 'photoCount' => $photoCount));
 
     $body = $this->theme->get($this->utility->getTemplate('photos.php'), array('album' => $album, 'tags' => $tags, 'photos' => $photos, 'pages' => $pages, 'options' => $filterOpts, 'headingHelper' => $headingHelper));
     $this->theme->display($this->utility->getTemplate('template.php'), array('body' => $body, 'page' => 'photos', 'album' => $album/* pass album through for header-secondary */));

diff --git a/src/libraries/models/Photo.php b/src/libraries/models/Photo.php
@@ -45,7 +45,7 @@ public function __construct($params = null)
     * @param string $protocol http or https
     * @return array
     */
-  public function addApiUrls($photo, $sizes, $token=null, $protocol=null)
+  public function addApiUrls($photo, $sizes, $token=null, $filterOpts=null, $protocol=null)
   {
     if($protocol === null)
       $protocol = $this->utility->getProtocol(false);
@@ -79,7 +79,7 @@ public function addApiUrls($photo, $sizes, $token=null, $protocol=null)
       unset($photo['pathOriginal']);
     }
 
-    $photo['url'] = $this->getPhotoViewUrl($photo);
+    $photo['url'] = $this->getPhotoViewUrl($photo, $filterOpts);
     return $photo;
   }
 
@@ -774,9 +774,9 @@ private function generateCustomUrl($basePath, $width, $height, $options)
     *
     * @return array Default values for a new photo
     */
-  private function getPhotoViewUrl($photo)
+  private function getPhotoViewUrl($photo, $filterOpts=null)
   {
-    return sprintf('%s://%s%s', $this->utility->getProtocol(false), $this->utility->getHost(false), $this->url->photoView($photo['id'], null, false));
+    return sprintf('%s://%s%s', $this->utility->getProtocol(false), $this->utility->getHost(false), $this->url->photoView($photo['id'], $filterOpts, false));
   }
 
   /**