Skip to content

Redo of #304 #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukeTowers merged 8 commits into from
Nov 5, 2019
Merged

Redo of #304 #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f408677
initial version of sorting versions
filipac Oct 17, 2019
478f3b8
required changes
filipac Oct 17, 2019
ef6be0c
Update widgets/VersionList.php
filipac Oct 17, 2019
ab28e7a
Update widgets/VersionList.php
filipac Oct 17, 2019
536539a
ident
filipac Oct 17, 2019
a6bd206
fix
filipac Oct 22, 2019
a0336e0
remove double button
filipac Nov 4, 2019
fb681fe
Merge pull request #304 from filipac/sort-versions
filipac Nov 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/less/builder.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,4 +195,4 @@ div.control-table .toolbar a.builder-custom-table-button {
background: white;
}
}
}
}
2 changes: 2 additions & 0 deletions lang/en/lang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,8 @@
'hint_apply' => 'Applying a version will also apply all older unapplied versions of the plugin.',
'dont_show_again' => 'Don\'t show again',
'save_unapplied_version' => 'Save unapplied version',
'sort_ascending' => 'Sort ascending',
'sort_descending' => 'Sort descending',
],
'menu' => [
'menu_label' => 'Backend Menu',
Expand Down
16 changes: 16 additions & 0 deletions widgets/VersionList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ public function __construct($controller, $alias)
$this->alias = $alias;

parent::__construct($controller, []);

$this->config->sort = $this->getSession('sort', 'asc');

$this->bindToController();
}

Expand Down Expand Up @@ -60,6 +63,15 @@ public function onSearch()
return $this->updateList();
}

public function onSort()
{
$this->config->sort = Input::input('sort');

$this->putSession('sort', $this->config->sort);

return ['#' . $this->getId('body') => $this->makePartial('widget-contents', $this->getRenderData())];
}

/*
* Methods for the internal use
*/
Expand Down Expand Up @@ -97,6 +109,10 @@ protected function getRenderData()
$items = $result;
}

if ($this->getConfig('sort', 'asc') === 'desc') {
$items = array_reverse($items, false);
}

$versionManager = VersionManager::instance();
$unappliedVersions = $versionManager->listNewVersions($activePluginVector->pluginCodeObj->toCode());
return [
Expand Down
11 changes: 11 additions & 0 deletions widgets/versionlist/partials/_sort.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php if ($this->getConfig('sort', 'asc') === 'asc'): ?>
<button data-request="<?= $this->getEventHandler('onSort') ?>"
data-request-data="sort: 'desc'"
class="btn btn-default empty last oc-icon-sort-numeric-desc"
title="<?= e(trans('rainlab.builder::lang.version.sort_descending')) ?>"></button>
<?php else: ?>
<button data-request="<?= $this->getEventHandler('onSort') ?>"
data-request-data="sort: 'asc'"
class="btn btn-default empty last oc-icon-sort-numeric-asc"
title="<?= e(trans('rainlab.builder::lang.version.sort_ascending')) ?>"></button>
<?php endif; ?>
7 changes: 4 additions & 3 deletions widgets/versionlist/partials/_toolbar.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="control-toolbar toolbar-padded">
<div class="toolbar-item" data-calculate-width>
<div class="btn-group">
<div class="dropdown last">
<div class="dropdown">
<button type="button" class="btn btn-default oc-icon-plus"
data-toggle="dropdown"
><?= e(trans('rainlab.builder::lang.common.add')) ?></button>
Expand All @@ -11,10 +11,11 @@
<li role="presentation"><a role="menuitem" tabindex="-1" href="javascript:;" data-builder-command="version:cmdCreateVersion" data-version-type="custom" class="oc-icon-repeat"><?= e(trans('rainlab.builder::lang.version.custom')) ?></a></li>

<li role="presentation"><a role="menuitem" tabindex="-1" href="javascript:;" data-builder-command="version:cmdCreateVersion" data-version-type="migration" class="oc-icon-table"><?= e(trans('rainlab.builder::lang.version.migration')) ?></a></li>

<li role="presentation"><a role="menuitem" tabindex="-1" href="javascript:;" data-builder-command="version:cmdCreateVersion" data-version-type="seeder" class="oc-icon-th"><?= e(trans('rainlab.builder::lang.version.seeder')) ?></a></li>
</ul>
</div>
<?= $this->makePartial('sort'); ?>
</div>
</div>
<div class="relative toolbar-item loading-indicator-container size-input-text">
Expand All @@ -31,4 +32,4 @@
/>
</div>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion widgets/versionlist/partials/_widget-contents.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
</div>
</div>
</div>
<?php endif ?>
<?php endif ?>