Merge remote-tracking branch 'origin/master'

Eduardo Santos
2 parents 58581dfe 3c19673d
Showing 2 changed files with 6 additions and 0 deletions Show diff stats
src/Cacic/CommonBundle/Entity/SoftwareRepository.php
src/Cacic/RelatorioBundle/Resources/views/Software/rel_naovinculados.html.twig
@@ -215,6 +215,7 @@ class SoftwareRepository extends EntityRepository
         // Monta a Consulta básica...
         $qb = $this->createQueryBuilder('sw');
         $qb->select('sw', 'tpsw', 'se')
+            ->innerJoin('CacicCommonBundle:PropriedadeSoftware', 'prop', 'WITH', 'sw.idSoftware = prop.software')
             ->leftJoin('sw.idTipoSoftware', 'tpsw')
             ->leftJoin('sw.estacoes', 'se')
             ->groupBy('sw', 'tpsw.idTipoSoftware', 'tpsw.teDescricaoTipoSoftware', 'se')
@@ -39,4 +39,9 @@
    </tbody>
 </table>
  
+{# display navigation #}
+<div class="navigation">
+    {{ knp_pagination_render(dados) }}
+</div>
+
 {% endblock %}
 \ No newline at end of file
...	...	@@ -215,6 +215,7 @@ class SoftwareRepository extends EntityRepository
215	215	// Monta a Consulta básica...
216	216	$qb = $this->createQueryBuilder('sw');
217	217	$qb->select('sw', 'tpsw', 'se')
	218	+ ->innerJoin('CacicCommonBundle:PropriedadeSoftware', 'prop', 'WITH', 'sw.idSoftware = prop.software')
218	219	->leftJoin('sw.idTipoSoftware', 'tpsw')
219	220	->leftJoin('sw.estacoes', 'se')
220	221	->groupBy('sw', 'tpsw.idTipoSoftware', 'tpsw.teDescricaoTipoSoftware', 'se')
...	...
...	...	@@ -39,4 +39,9 @@
39	39	</tbody>
40	40	</table>
41	41
	42	+{# display navigation #}
	43	+<div class="navigation">
	44	+ {{ knp_pagination_render(dados) }}
	45	+</div>
	46	+
42	47	{% endblock %}
43	48	\ No newline at end of file
...	...