Skip to content

Commit

Permalink
Merge branch 'release/6.16.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
nickdenardis committed Jul 31, 2020
2 parents 92c7bee + 0f213c4 commit 1eb6fbb
Show file tree
Hide file tree
Showing 13 changed files with 601 additions and 291 deletions.
1 change: 1 addition & 0 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @waynestate/wayne-state-web-team
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Starter repository for creating a new website. Live demo can be found at https:/
1. run `make install`
1. run `make build`
1. run `make watch`
1. open https://domain.local:3000/ (for BrowserySync)
1. open https://domain.local:3000/ (for BrowserSync)

## Deployment

Expand Down
10 changes: 5 additions & 5 deletions app/Repositories/GridRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ public function __construct(Connector $wsuApi, ParsePromos $parsePromos, Reposit
public function getGridPromos(array $data, $limit = 75)
{
$group_reference = [];

// If there is an grid custom page field then inject it into the group reference
if (!empty($data['data']['grid_promo_group_id'])) {
$group_reference[$data['data']['grid_promo_group_id']] = 'grid_promos';
} else {

if (empty($data['data']['grid_promo_group_id'])) {
return ['grid_promos' => []];
}

// If there is an grid custom page field then inject it into the group reference
$group_reference[$data['data']['grid_promo_group_id']] = 'grid_promos';

$group_config = [
'grid_promos' => 'limit:' . $limit,
];
Expand Down
Loading

0 comments on commit 1eb6fbb

Please sign in to comment.