Download as
Browse Code »

Commit 5702950f40e32b450d6161fa371ea08e618cc8f4

Authored by Ciro Junior
1 parent 3285929a
Exists in master

[Redmine #4466 

Commit parcial.
Showing 2 changed files with 11 additions and 8 deletions   Show diff stats
cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java
  Diff comments   View file @5702950
@@ -202,7 +202,7 @@ public class StartupListenerEcm extends UtilStartup implements ApplicationListen @@ -202,7 +202,7 @@ public class StartupListenerEcm extends UtilStartup implements ApplicationListen
202 list.add(new Dominio("formaNumeracao", "Sequencial único", "SEQUENCIAL_UNICO", 2L)); 202 list.add(new Dominio("formaNumeracao", "Sequencial único", "SEQUENCIAL_UNICO", 2L));
203 203
204 list.add(new Dominio("tipoAssinatura", "Assinatura interna", "ASSINATURA_INTERNA", 1L)); 204 list.add(new Dominio("tipoAssinatura", "Assinatura interna", "ASSINATURA_INTERNA", 1L));
205 - list.add(new Dominio("tipoAssinatura", "Assinatura por certificado digital", "ASSINATURA_INTERNA", 2L)); 205 + list.add(new Dominio("tipoAssinatura", "Assinatura por certificado digital", "ASSINATURA_CERTIFICADO_DIGITAL", 2L));
206 206
207 this.dominioService.saveListIfNotExist(list); 207 this.dominioService.saveListIfNotExist(list);
208 208
cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html
  Diff comments   View file @5702950
@@ -42,24 +42,27 @@ @@ -42,24 +42,27 @@
42 </fieldset> 42 </fieldset>
43 <div class="row"> 43 <div class="row">
44 <div class="col-md-6"> 44 <div class="col-md-6">
45 - <label-input ng-id="tarjaAssinatura.descricao" ng-label="LABEL.DESCRICAO" ng-type="text" ng-model="tarjaAssinatura.descricao"  
46 - form="tarjaAssinaturaForm" ng-obrigatorio="true" ng-custom-maxlength="100" ng-type="text" ng-disabled="!edit" /> 45 + <label-input ng-id="tarjaAssinatura.assinaturaInterna.descricao" ng-label="LABEL.DESCRICAO" ng-type="text"
  46 + ng-model="tarjaAssinatura.assinaturaInterna.descricao" form="tarjaAssinaturaForm" ng-obrigatorio="true"
  47 + ng-custom-maxlength="100" ng-type="text" ng-disabled="!edit" />
47 </div> 48 </div>
48 <div class="col-md-4"> 49 <div class="col-md-4">
49 - <label-input ng-id="tarjaAssinatura.tipoAssinatura" ng-label="LABEL.TIPO_ASSINATURA" ng-type="text" ng-disabled="true"  
50 - ng-model="tarjaAssinatura.tipoAssinatura" form="tarjaAssinaturaForm" ng-obrigatorio="false" ng-type="text" /> 50 + <label-input ng-id="tarjaAssinatura.assinaturaInterna.tipoAssinatura" ng-label="LABEL.TIPO_ASSINATURA" ng-type="text"
  51 + ng-disabled="true" ng-model="tarjaAssinatura.assinaturaInterna.tipoAssinatura" form="tarjaAssinaturaForm"
  52 + ng-obrigatorio="false" ng-type="text" />
51 </div> 53 </div>
52 </div> 54 </div>
53 <div class="row"> 55 <div class="row">
54 <div class="col-md-12"> 56 <div class="col-md-12">
55 <div class="form-group"> 57 <div class="form-group">
56 - <label class="control-label block" ng-class="{'has-error': !tarjaAssinatura.conteudo && tarjaAssinaturaForm.$submitted}"> 58 + <label class="control-label block" ng-class="{'has-error': !tarjaAssinatura.assinaturaInterna.conteudo && tarjaAssinaturaForm.$submitted}">
57 <translate>ECM.LABEL.CONTEUDO_HTML</translate> <span class="red">*</span> 59 <translate>ECM.LABEL.CONTEUDO_HTML</translate> <span class="red">*</span>
58 - <i ng-show="!tarjaAssinatura.conteudo && tarjaAssinaturaForm.$submitted" class='fa fa-warning red' 60 + <i ng-show="!tarjaAssinatura.assinaturaInterna.conteudo && tarjaAssinaturaForm.$submitted" class='fa fa-warning red'
59 tooltip="{{$translate.instant('ECM.LABEL.CONTEUDO_HTML') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}" 61 tooltip="{{$translate.instant('ECM.LABEL.CONTEUDO_HTML') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}"
60 tooltip-placement='top'></i> 62 tooltip-placement='top'></i>
61 </label> 63 </label>
62 - <div id="tarjaAssinatura.conteudo" ckeditor="options" ng-if='edit' ng-model="tarjaAssinatura.conteudo" ready="onReady()"></div> 64 + <div id="tarjaAssinatura.assinaturaInterna.conteudo" ckeditor="options" ng-if='edit' ready="onReady()"
  65 + ng-model="tarjaAssinatura.assinaturaInterna.conteudo" ></div>
63 <iframe id="visualizacaoConteudoTarjaAssinatura" allowfullscreen class="iframe-report" ng-show="!edit"></iframe> 66 <iframe id="visualizacaoConteudoTarjaAssinatura" allowfullscreen class="iframe-report" ng-show="!edit"></iframe>
64 </div> 67 </div>
65 </div> 68 </div>