Proyectos de Subversion LeadersLinked - Antes de SPA

Rev

Rev 3648 | Rev 3712 | Ir a la última revisión | Mostrar el archivo completo | | | Autoría | Ultima modificación | Ver Log |

Rev 3648 Rev 3691
Línea 1143... Línea 1143...
1143 
 
 1143 
 
1144 
 
 1144 
 
1145 
            }
 1145 
            }
1146 
            if($type == 'company') {
 1146 
            if($type == 'company') {
Línea 1147... Línea 1147...
1147 
                $companyMapper = CompanyMapper::getInstance($this->adapter);
 1147 
                $companyMapper = CompanyMapper::getInstance($this->adapter);
1148 
                $company = $companyMapper->fetchOneByIdAndNetworkId($id, $currentUser->network_id);
 1148 
                $company = $companyMapper->fetchOneByUuidAndNetworkId($id, $currentUser->network_id);
1149
1149
1150 
                if(!$company || $company->status != Company::STATUS_ACTIVE) {
 1150 
                if(!$company || $company->status != Company::STATUS_ACTIVE) {
Línea 1179... Línea 1179...
1179 
                $select->where->and->equalTo('type', Feed::TYPE_COMPANY);
 1179 
                $select->where->and->equalTo('type', Feed::TYPE_COMPANY);
1180 
                $select->order('added_on desc');
 1180 
                $select->order('added_on desc');
1181 
            }
 1181 
            }
1182 
            if($type == 'group') {
 1182 
            if($type == 'group') {
1183 
                $groupMapper = GroupMapper::getInstance($this->adapter);
 1183 
                $groupMapper = GroupMapper::getInstance($this->adapter);
1184 
                $group = $groupMapper->fetchOneByIdAndNetworkId($id, $currentUser->network_id);
 1184 
                $group = $groupMapper->fetchOneByUuidAndNetworkId($id, $currentUser->network_id);
Línea 1185... Línea 1185...
1185
1185
Línea 1186... Línea 1186...
1186 
                $id = 0;
 1186 
                $id = 0;
1187
1187
Línea 1206... Línea 1206...
1206 
                $select->where->equalTo('network_id', $currentUser->network_id);
 1206 
                $select->where->equalTo('network_id', $currentUser->network_id);
1207 
                $select->where->equalTo('status', Feed::STATUS_PUBLISHED);
 1207 
                $select->where->equalTo('status', Feed::STATUS_PUBLISHED);
1208 
                $select->where->equalTo('group_id', $id);
 1208 
                $select->where->equalTo('group_id', $id);
1209 
                $select->where->and->equalTo('type', Feed::TYPE_GROUP);
 1209 
                $select->where->and->equalTo('type', Feed::TYPE_GROUP);
1210 
                $select->order('added_on desc');
 1210 
                $select->order('added_on desc');
- 
 
 1211
1211
1212 
 
1212 
            }
 1213 
            }
Línea 1213... Línea 1214...
1213
1214
1214 
            $dbSelect = new DbSelect($select, $this->adapter);
 1215 
            $dbSelect = new DbSelect($select, $this->adapter);
1215 
            $paginator = new Paginator($dbSelect);
 1216 
            $paginator = new Paginator($dbSelect);