Skip to content

Replaces the twinnable property force_context with force_context_fallback #272

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
shaoshiva wants to merge 3 commits into
base: master/elche
Choose a base branch
from
Open

Replaces the twinnable property force_context with force_context_fallback #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5648f99
Replaces force_context with force_context_fallback
shaoshiva Jan 30, 2017
352003a
Replaces force_context with force_context_fallback
shaoshiva Jan 30, 2017
5719320
Replaces force_context with force_context_fallback
shaoshiva Jan 30, 2017
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
16 changes: 8 additions & 8 deletions framework/classes/orm/twinnable/belongsto.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,12 @@ public function get(\Orm\Model $from)
if ($this->front_context_fallback && (NOS_ENTRY_POINT == Nos::ENTRY_POINT_FRONT)) {
//front context is used
$context_to = Nos::main_controller()->getContext();
} elseif (empty($this->force_context_fallback)) {
} elseif (!empty($this->force_context_fallback)) {
//specified context is used
$context_to = $this->force_context_fallback;
} else {
//model context is used
$context_to = $from->{$this->column_context_from};
} else {
//default context is used
$context_to = $this->force_context_fallback;
}
$context_to = \DB::expr(\DB::quote($context_to));

Expand Down Expand Up @@ -186,12 +186,12 @@ public function join($alias_from, $rel_name, $alias_to_nr, $conditions = array()
if ($this->front_context_fallback && (NOS_ENTRY_POINT == Nos::ENTRY_POINT_FRONT)) {
//front context is used
$context_to = \DB::expr(\DB::quote(Nos::main_controller()->getContext()));
} elseif (empty($this->force_context_fallback)) {
} elseif (!empty($this->force_context_fallback)) {
//specified context is used
$context_to = \DB::expr(\DB::quote($this->force_context_fallback));
} else {
//model context is used
$context_to = $alias_from.'.'.$this->column_context_from;
} else {
//default context is used
$context_to = \DB::expr(\DB::quote($this->force_context));
}


Expand Down
16 changes: 8 additions & 8 deletions framework/classes/orm/twinnable/hasmany.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,12 @@ public function get(\Orm\Model $from)
if ($this->front_context_fallback && (NOS_ENTRY_POINT == Nos::ENTRY_POINT_FRONT)) {
//front context is used
$context_to = Nos::main_controller()->getContext();
} elseif (empty($this->force_context_fallback)) {
} elseif (!empty($this->force_context_fallback)) {
//specified context is used
$context_to = $this->force_context_fallback;
} else {
//model context is used
$context_to = $from->{$this->column_context_from};
} else {
//default context is used
$context_to = $this->force_context_fallback;
}

return $class::findMainOrContext($context_to, $conditions);
Expand Down Expand Up @@ -182,12 +182,12 @@ public function join($alias_from, $rel_name, $alias_to_nr, $conditions = array()
if ($this->front_context_fallback && (NOS_ENTRY_POINT == Nos::ENTRY_POINT_FRONT)) {
//front context is used
$context_to = \DB::expr(\DB::quote(Nos::main_controller()->getContext()));
} elseif (empty($this->force_context_fallback)) {
} elseif (!empty($this->force_context_fallback)) {
//specified context is used
$context_to = \DB::expr(\DB::quote($this->force_context_fallback));
} else {
//model context is used
$context_to = $alias_from.'.'.$this->column_context_from;
} else {
//default context is used
$context_to = \DB::expr(\DB::quote($this->force_context));
}

$models[$rel_name_main]['join_on'][] = array($alias_to_main.'.'.$this->column_context_is_main_to, '=', DB::expr(1));
Expand Down
16 changes: 8 additions & 8 deletions framework/classes/orm/twinnable/hasone.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,12 @@ public function get(\Orm\Model $from)
if ($this->front_context_fallback && (NOS_ENTRY_POINT == Nos::ENTRY_POINT_FRONT)) {
//front context is used
$context_to = Nos::main_controller()->getContext();
} elseif (empty($this->force_context_fallback)) {
} elseif (!empty($this->force_context_fallback)) {
//specified context is used
$context_to = $this->force_context_fallback;
} else {
//model context is used
$context_to = $from->{$this->column_context_from};
} else {
//default context is used
$context_to = $this->force_context_fallback;
}

$query->and_where_open();
Expand Down Expand Up @@ -187,12 +187,12 @@ public function join($alias_from, $rel_name, $alias_to_nr, $conditions = array()
if ($this->front_context_fallback && (NOS_ENTRY_POINT == Nos::ENTRY_POINT_FRONT)) {
//front context is used
$context_to = \DB::expr(\DB::quote(Nos::main_controller()->getContext()));
} elseif (empty($this->force_context_fallback)) {
} elseif (!empty($this->force_context_fallback)) {
//specified context is used
$context_to = \DB::expr(\DB::quote($this->force_context_fallback));
} else {
//model context is used
$context_to = $alias_from.'.'.$this->column_context_from;
} else {
//default context is used
$context_to = \DB::expr(\DB::quote($this->force_context));
}


Expand Down