reverted minor merge issue
This commit is contained in:
@@ -208,11 +208,6 @@ class Contract extends mfBaseModel {
|
||||
return $this->journals;
|
||||
}
|
||||
|
||||
if($name == "journals") {
|
||||
$this->journals = array_reverse(ContractjournalModel::search(["contract_id" => $this->id]));
|
||||
return $this->journals;
|
||||
}
|
||||
|
||||
if($name == "links") {
|
||||
$this->links = ContractLinkModel::includesContractId($this->id, ["type" => $link]);
|
||||
//var_dump($this->links);exit;
|
||||
|
||||
@@ -9,12 +9,12 @@ class Product extends mfBaseModel {
|
||||
private $attributes;
|
||||
|
||||
public function loadAttributes() {
|
||||
$this->attributes = [];
|
||||
|
||||
if(!$this->producttech_id) {
|
||||
return [];
|
||||
}
|
||||
|
||||
$this->attributes = [];
|
||||
|
||||
// get tech attribs
|
||||
$ptattribs = mfValuecache::singleton()->get("ProducttechAttributes-techid-".$this->producttech_id);
|
||||
if($ptattribs === null) {
|
||||
|
||||
Reference in New Issue
Block a user