fixes

livestreet · Oct 13, 2016 · 474866d · 474866d
1 parent f1d353c
commit 474866d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/classes/engine/EntityORM.class.php b/classes/engine/EntityORM.class.php
@@ -809,6 +809,9 @@ public function __call($sName, $aArgs)
                             $aFilterAdd = $aRelations[$sKey]['filter'];
                             $sCmd = "{$sRelPluginPrefix}{$sRelModuleName}_get{$sRelEntityName}ByFilter";
                             $aFilterAdd = array_merge(array($sRelationKey => $iPrimaryKeyValue), $aFilterAdd);
+                            if ($bUseFilter) {
+                                $aFilterAdd = array_merge($aFilterAdd, $aArgs[0]);
+                            }
                             $mCmdArgs = array($aFilterAdd);
                             break;
                         case self::RELATION_TYPE_HAS_MANY :

diff --git a/frontend/components/more/js/more.js b/frontend/components/more/js/more.js
@@ -118,11 +118,14 @@
 
                     // Обновляем счетчик
                     var countLeft = this.getCount() - response.count_loaded;
+                    if ('undefined' !== typeof response.count_left) {
+                        countLeft = response.count_left;
+                    }
 
                     if ( countLeft <= 0 ) {
                         response.hide = true;
                     } else {
-                        this.setCount( countLeft || 0 );
+                        this.setCount( countLeft || 0);
                     }
 
                     // Обновляем параметры
@@ -132,6 +135,7 @@
                 } else {
                     // Для блоков без счетчиков
                     ls.msg.notice( null, this._i18n( 'empty' ) );
+                    response.hide = true;
                 }
 
                 if ( response.hide ) {