Skip to content

Apply filters for updates #11

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Apply filters for updates #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e717b4
Apply filters for update
Jan 8, 2016
0dcabd4
Merge pull request #1 from slothfk/mus-filters
Jan 15, 2016
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
13 changes: 7 additions & 6 deletions codebase/base_connector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,7 @@ public function render(){
$this->set_relation();

if ($this->live_update !== false && $this->updating!==false) {
$this->apply_filters();
$this->live_update->get_updates();
} else {
if ($this->editing){
Expand All @@ -501,10 +502,7 @@ public function render(){
$this->event->trigger("beforeSort",$wrap);
$wrap->store();

$wrap = new FilterInterface($this->request);
$this->apply_filters($wrap);
$this->event->trigger("beforeFilter",$wrap);
$wrap->store();
$this->apply_filters();

if ($this->model && method_exists($this->model, "get")){
$this->sql = new ArrayDBDataWrapper();
Expand Down Expand Up @@ -887,11 +885,14 @@ public function clear_filter() {
$this->request->set_filters(array());
}

protected function apply_filters($wrap) {
protected function apply_filters() {
$wrap = new FilterInterface($this->request);
for ($i = 0; $i < count($this->filters); $i++) {
$f = $this->filters[$i];
$wrap->add($f['name'], $f['value'], $f['operation']);
}
$this->event->trigger("beforeFilter",$wrap);
$wrap->store();
}

public function sort($name, $direction = false) {
Expand Down Expand Up @@ -953,4 +954,4 @@ public function render(){
}
}

?>
?>