Merge pull request #1426 from pols12/fix/sort_itemSetsInSite

Fix itemSet sorting priority in site view
omeka · Jul 15, 2019 · db563b5 · db563b5
2 parents 3fa2d44 + 495dbdb
commit db563b5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/application/src/Api/Adapter/ItemSetAdapter.php b/application/src/Api/Adapter/ItemSetAdapter.php
@@ -15,6 +15,11 @@ class ItemSetAdapter extends AbstractResourceEntityAdapter
  'modified' => 'modified',
  'title' => 'title',
  ];
+ /**
+ * Alias of query builder for join clause between `site` and `item_sets`.
+ * @var string
+ */
+ protected $siteItemSetsAlias;
 
  public function getResourceName()
  {
@@ -68,16 +73,15 @@ public function buildQuery(QueryBuilder $qb, array $query)
  } catch (Exception\NotFoundException $e) {
  $site = null;
  }
- $siteItemSetsAlias = $this->createAlias();
+ $this->siteItemSetsAlias = $this->createAlias();
  $qb->innerJoin(
  'omeka_root.siteItemSets',
- $siteItemSetsAlias
+ $this->siteItemSetsAlias
  );
  $qb->andWhere($qb->expr()->eq(
- "$siteItemSetsAlias.site",
+ "$this->siteItemSetsAlias.site",
  $this->createNamedParameter($qb, $query['site_id']))
  );
- $qb->addOrderBy("$siteItemSetsAlias.position", 'ASC');
  }
  }
 
@@ -90,6 +94,10 @@ public function sortQuery(QueryBuilder $qb, array $query)
  parent::sortQuery($qb, $query);
  }
  }
+ //In site view, sorting by admin-defined position
+ if (isset($this->siteItemSetsAlias)) {
+ $qb->addOrderBy("$this->siteItemSetsAlias.position", 'ASC');
+ }
  }
 
  public function hydrate(Request $request, EntityInterface $entity,

diff --git a/application/src/Controller/Site/ItemSetController.php b/application/src/Controller/Site/ItemSetController.php
@@ -14,8 +14,6 @@ public function browseAction()
  {
  $site = $this->currentSite();
 
- $this->setBrowseDefaults('created');
-
  $query = $this->params()->fromQuery();
  $query['site_id'] = $site->id();
  $response = $this->api()->search('item_sets', $query);