Download as
Browse Code »

Commit ac824f68850a98abb1a50b5734fb7370b3621a07

Authored by Gedeson Wasley
1 parent 63410c55
Exists in master and in 1 other branch 3.1

Correções de patrimonio

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
src/Cacic/RelatorioBundle/Controller/DefaultController.php
  Diff comments   View file @ac824f6
@@ -30,7 +30,7 @@ class DefaultController extends Controller @@ -30,7 +30,7 @@ class DefaultController extends Controller
30 { 30 {
31 $locais = $this->getDoctrine()->getRepository('CacicCommonBundle:Local')->listar(); 31 $locais = $this->getDoctrine()->getRepository('CacicCommonBundle:Local')->listar();
32 $so = $this->getDoctrine()->getRepository('CacicCommonBundle:So')->listar(); 32 $so = $this->getDoctrine()->getRepository('CacicCommonBundle:So')->listar();
33 - $sw = $this->getDoctrine()->getRepository('CacicCommonBundle:Software')->listar(); 33 + $sw = $this->getDoctrine()->getRepository('CacicCommonBundle:Software')->listarSoftware();
34 $uorg = $this->getDoctrine()->getRepository('CacicCommonBundle:Uorg')->listar(); 34 $uorg = $this->getDoctrine()->getRepository('CacicCommonBundle:Uorg')->listar();
35 $conf = $this->getDoctrine()->getRepository('CacicCommonBundle:ComputadorColeta')->listarPropriedades('Patrimonio'); 35 $conf = $this->getDoctrine()->getRepository('CacicCommonBundle:ComputadorColeta')->listarPropriedades('Patrimonio');
36 36
src/Cacic/RelatorioBundle/Resources/views/Default/patrimonio.html.twig
  Diff comments   View file @ac824f6
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 22
23 tSW.populate([ // Popula o TRANSFER com Softwares 23 tSW.populate([ // Popula o TRANSFER com Softwares
24 {% for sw in sw %} 24 {% for sw in sw %}
25 - {value: "{{ sw[0]['idSoftware'] }}", content:"{{ sw[0]['nmSoftware'] }}"}{% if loop.last != true %},{% endif %} 25 + {value: "{{ sw['idClassProperty'] }}", content:"{{ sw['nmSoftware'] }}"}{% if loop.last != true %},{% endif %}
26 26
27 {% endfor %} 27 {% endfor %}
28 ]); 28 ]);