Commit b55fe95ca4d7d58ca348ba88686d4e82e9a2a0c2
Exists in
master
Merge branch 'master' of https://scm.centralit.com.br/scm/git/cit-grp-corporativo
Showing
3 changed files
with
11 additions
and
6 deletions
Show diff stats
cit-portal-api/src/main/java/br/com/centralit/api/service/impl/MenuServiceImpl.java
... | ... | @@ -196,7 +196,11 @@ public class MenuServiceImpl extends GenericServiceImpl<Menu, Long> implements M |
196 | 196 | |
197 | 197 | this.validarChaveMenuEPagina(menu); |
198 | 198 | menu.setPermissaoDeAcessoDefinida(Boolean.TRUE); |
199 | - return super.save(this.menu); | |
199 | + menu = super.save(this.menu); | |
200 | + | |
201 | + this.adicionarGrupoMasterMenu(menu); | |
202 | + | |
203 | + return menu; | |
200 | 204 | } |
201 | 205 | |
202 | 206 | public Menu mergeSimples(Menu menu) { | ... | ... |
cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/ListViewDirective.js
... | ... | @@ -19,7 +19,8 @@ citApp.directive("listView", ["$translate", "$injector", "$timeout", "$filter", |
19 | 19 | setTotalPages : '=?setTotalPages', |
20 | 20 | setTotalItens : '=?setTotalItens', |
21 | 21 | useCustomFilterTemp : '=?useCustomFilterTemp', |
22 | - customFilter : '&ngCustomFilter' | |
22 | + customFilter : '&ngCustomFilter', | |
23 | + campoMarcacao : '@ngCampoMarcacao' | |
23 | 24 | }, |
24 | 25 | replace : true, |
25 | 26 | restrict : 'E', | ... | ... |
cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/html/listView.html
... | ... | @@ -119,18 +119,18 @@ |
119 | 119 | </div> |
120 | 120 | </td> |
121 | 121 | </tr> |
122 | -<tr ng-repeat-start="model in lista"> | |
123 | - <td ng-if="isCheckBox != undefined && isCheckBox" ng-class="(model.isEntradaConcluida != undefined && !model.isEntradaConcluida) ? 'text-center danger' : 'text-center'"> | |
122 | + <tr ng-repeat-start="model in lista" ng-class="(model[campoMarcacao] != undefined && !model[campoMarcacao]) ? 'danger' : ''"> | |
123 | + <td ng-if="isCheckBox != undefined && isCheckBox" ng-class="text-center"> | |
124 | 124 | <input type="checkbox" ng-checked="model.$checkedChBox" ng-click="checkboxItem(model)" ng-model="model.$checkedChBox"/> |
125 | 125 | </td> |
126 | 126 | <td ng-show="(isCheckBox == undefined || !isCheckBox) && exibirColunaSelecao" style="width: 5%"><input type="radio" name="modelChecked" ng-value="model" ng-model="$parent.itemSelecionado" |
127 | - ng-class="(model.isEntradaConcluida != undefined && !model.isEntradaConcluida) ? 'text-center danger' : 'text-center'"/></td> | |
127 | + ng-class="text-center"/></td> | |
128 | 128 | <td class="text-center" style="width: 5%" ng-if="exibirExpandir"> |
129 | 129 | <a href="#void" class="green" title="{{$translate.instant('LABEL.EXPANDIR')}}" ng-click="expandirLinha(model)"> |
130 | 130 | <i class="ace-icon fa fa-2x" ng-class="{'fa-angle-double-down': model.$expandido, 'fa-angle-double-right': !model.$expandido}"></i> |
131 | 131 | </a> |
132 | 132 | </td> |
133 | - <td ng-repeat="header in headers" ng-class="(model.isEntradaConcluida != undefined && !model.isEntradaConcluida) ? 'text-center danger' : 'text-center'"> | |
133 | + <td ng-repeat="header in headers" ng-class="text-center"> | |
134 | 134 | <div class="{{header.align ? header.align : (header.filter == 'currency'? 'text-right' : 'text-center')}}"> |
135 | 135 | <span ng-if="header.filter">{{aplicarFiltro(model[header.value], header.filter)}}</span> |
136 | 136 | <div ng-if="!header.filter"> | ... | ... |