Download as
Browse Code »

Commit 1e3a307579a0bab9224f481e2adfb05563c0ed63

Authored by rogerio.costa
1 parent 51d4806b
Exists in master

#4393 Correção de defeitos encontrados em homologação

Showing 5 changed files with 19 additions and 58 deletions   Show diff stats
cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/AnexoGedServiceImpl.java
  Diff comments   View file @1e3a307
... ... @@ -107,7 +107,7 @@ public class AnexoGedServiceImpl extends GenericServiceImpl<AnexoGed, Long> impl
107 107  
108 108 documentoGed.setConteudo(this.gedFileService.doOcr(anexo));
109 109  
110   -// this.solrService.addDocumento(documentoGed);
  110 + this.solrService.addDocumento(documentoGed);
111 111  
112 112 anexo.setDocumentoGed(documentoGed);
113 113  
... ...
cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/DocumentoGedServiceImpl.java
  Diff comments   View file @1e3a307
... ... @@ -176,7 +176,7 @@ public class DocumentoGedServiceImpl extends GenericServiceImpl<DocumentoGed, Lo
176 176 entity.setConteudo(this.decrypted(entity.getConteudoCriptografado()));
177 177 }
178 178  
179   - // this.saveSolr(entity);
  179 + this.saveSolr(entity);
180 180  
181 181 this.verificaTemporalidadeProcesso(entity);
182 182  
... ...
cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/GerenciarProcessoListUnidadeController.js
  Diff comments   View file @1e3a307
... ... @@ -176,60 +176,22 @@ citApp.controller('GerenciarProcessoListUnidadeController', ['$scope', 'workflow
176 176 });
177 177 };
178 178  
179   - // ADICIONA CHECK NA VERSAOFLUXO SELECIONADA
180   -/* $scope.checkProcessoNegocio = function (indexProcessoNegocio, processoNegocio) {
181   - $scope.indexProcessoNegocio = indexProcessoNegocio;
182   - $scope.businessProcess = processoNegocio;
183   - };*/
184   -
185   -/* $scope.iniciarProcessoNegocio = function(processo){
186   - BusinessProcessRepository.initialize(processo).then(function(result) {
187   - $scope.businessProcess = result.originalElement.businessProcess;
188   -
189   - var pagina = '/cit-esi-web/assets/js/angular/custom/directive/html/startBusinessProcess.html';
190   - if ($scope.businessProcess.target == 'FLOW') {
191   - $scope.flowVersion = result.originalElement.flowVersion;
192   - if ($scope.flowVersion.userInterface && $scope.flowVersion.userInterface.executeCustomPage) {
193   - pagina = $scope.flowVersion.userInterface.URLCustomPage;
194   - $scope.abrirPaginaProcesso(pagina);
195   - }else if ($scope.flowVersion.userInterface && $scope.flowVersion.userInterface.resource && $scope.flowVersion.userInterface.resourceName) {
196   - FormBuilderRepository.getByName($scope.flowVersion.userInterface.resourceName).then(function(result) {
197   - pagina = '/cit-esi-web/forms/'+result.originalElement.path+'/'+result.originalElement.resource.name+"_process.html";
198   - $scope.abrirPaginaProcesso(pagina);
199   - });
200   - }else{
201   - $scope.abrirPaginaProcesso(pagina);
202   - }
203   - }else if ($scope.businessProcess.target == 'FORM') {
204   - FormBuilderRepository.getByName($scope.businessProcess.form.name).then(function(result) {
205   - pagina = '/cit-esi-web/forms/'+result.originalElement.path+'/'+result.originalElement.resource.name+"_process.html";
206   - $scope.abrirPaginaProcesso(pagina);
207   - });
208   - }else if ($scope.businessProcess.target == 'PAGE') {
209   - pagina = '/cit-esi-web/pages/'+$scope.businessProcess.pageVersion.fileName;
210   - $scope.abrirPaginaProcesso(pagina);
211   - }else if ($scope.businessProcess.target == 'URL') {
212   - pagina = $scope.businessProcess.url;
213   - $scope.abrirPaginaProcesso(pagina);
214   - }else{
215   - $scope.abrirPaginaProcesso(pagina);
  179 + $scope.init = function(filter) {
  180 + if (filter.businessProcessName) {
  181 + $scope.filterCriteria.businessProcessName = "";
  182 + var i = 0;
  183 + for (var i = 0; i < filter.businessProcessName.length; i++) {
  184 + if (i > 0) {
  185 + $scope.filterCriteria.businessProcessName += ",";
  186 + }
  187 + $scope.filterCriteria.businessProcessName += filter.businessProcessName[i];
216 188 }
217   - });
218   - };*/
219   -
220   -/* $scope.abrirPaginaProcesso = function(pagina) {
221   - if (appService.existsWorkspace(pagina)) {
222   - $scope.showAlert('warning', $translate.instant('ESI.MSG.JA_EXISTE_TELA_PROCESSO'));
223   - return ;
224 189 }
225   -
226   - $rootScope.businessProcess = $scope.businessProcess;
227   - $rootScope.controllerScope = $scope;
228   - $rootScope.listaBreadcrumb = [];
229   -
230   - $scope.addNewWorkspace($rootScope.businessProcess.description, pagina, true, 'mod-orange', $rootScope.businessProcess);
231   - };*/
232   -
  190 + $scope.filterCriteria.taskName = filter.taskName;
  191 + $scope.filterCriteria.username = filter.username;
  192 + $scope.filterCriteria.groups = filter.groups;
  193 + };
  194 +
233 195 $scope.executarTarefa = function(assignment){
234 196 $scope.task = assignment.workItem;
235 197  
... ...
cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/SolrSearchController.js
  Diff comments   View file @1e3a307
... ... @@ -120,7 +120,7 @@ citApp.controller(&#39;SolrSearchController&#39;, [&#39;$scope&#39;,&#39;$attrs&#39;,&#39;$location&#39;,&#39;$route
120 120 $scope.handleSetPage = function() {
121 121  
122 122 $scope.timeout = $timeout(function () {
123   - var query = SolrSearchService.createQuery("https://172.20.0.74:8983/solr/jcg");
  123 + var query = SolrSearchService.createQuery("https://localhost:8983/solr/jcg");
124 124 query.setOption("rows", "10");
125 125 query.setOption("facet", "true");
126 126 query.setOption("facet.limit", $scope.maxHints);
... ... @@ -319,7 +319,7 @@ citApp.controller(&#39;SolrSearchController&#39;, [&#39;$scope&#39;,&#39;$attrs&#39;,&#39;$location&#39;,&#39;$route
319 319 else if ($scope.userQuery.length >= $scope.minSearchLength) {
320 320 if ($scope.timeout) $timeout.cancel($scope.timeout);
321 321 $scope.timeout = $timeout(function () {
322   - var query = SolrSearchService.createQuery("https://172.20.0.74:8983/solr/jcg");
  322 + var query = SolrSearchService.createQuery("https://localhost:8983/solr/jcg");
323 323 query.setOption("rows", "10");
324 324 query.setOption("facet", "true");
325 325 query.setOption("facet.limit", $scope.maxHints);
... ... @@ -388,7 +388,7 @@ citApp.controller(&#39;SolrSearchController&#39;, [&#39;$scope&#39;,&#39;$attrs&#39;,&#39;$location&#39;,&#39;$route
388 388 $scope.userQuery = "*:*";
389 389 }
390 390 $scope.timeout = $timeout(function () {
391   - var query = SolrSearchService.createQuery("https://172.20.0.74:8983/solr/jcg");
  391 + var query = SolrSearchService.createQuery("https://localhost:8983/solr/jcg");
392 392 query.setOption("rows", "10");
393 393 query.setOption("facet", "true");
394 394 query.setOption("facet.limit", $scope.maxHints);
... ...
cit-ecm-web/src/main/webapp/html/pesquisa/pesquisa.html
  Diff comments   View file @1e3a307
... ... @@ -33,7 +33,6 @@
33 33  
34 34 <div class="row">
35 35 <div class="col-md-8" ng-show='userQuery != "" && apresentarMsgSemResultado'>
36   - <pre>{{apresentarMsgSemResultado}}</pre>
37 36 </p><translate>ECM.LABEL.SUA_PESQUISA</translate>: <label style="font-weight: bold;">{{userQuery}} </label>
38 37 </p><translate>ECM.LABEL.NENHUM_DOCUMENTO_CORRESPONDENTE</translate>
39 38 </p><translate>ECM.LABEL.SUGESTOES</translate>
... ...