Verified Commit 8837f0d8 authored by Giovannoni Laurent's avatar Giovannoni Laurent

Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop

parents 3016f87c b4efd38d
......@@ -90,20 +90,6 @@
</div>
</div>
<div class="form-group">
<div class="col-sm-12">
<mat-form-field>
<mat-select id="foldertypeList" name="foldertypeList"
title="{{lang.folderTypeList}}" placeholder="{{lang.folderTypeList}}"
[(ngModel)]="currentFirstLevel.foldertype_id" multiple required>
<mat-option *ngFor="let folderType of folderTypes"
[value]="folderType.foldertype_id">
{{folderType.foldertype_label}}
</mat-option>
</mat-select>
</mat-form-field>
</div>
</div>
<div class="form-group">
<div class="col-md-12 text-center" style="padding:10px;">
<button mat-raised-button [disabled]="!firstLevelForm.form.valid" color="primary"
(click)="saveFirstLevel()">{{lang.save}}</button>
......
......@@ -30,7 +30,6 @@ export class DoctypesAdministrationComponent implements OnInit {
currentSecondLevel: any = false;
currentFirstLevel: any = false;
firstLevels: any = false;
folderTypes: any = false;
types: any = false;
secondLevels: any = false;
processModes: any = false;
......@@ -218,7 +217,6 @@ export class DoctypesAdministrationComponent implements OnInit {
this.http.get("../../rest/doctypes/firstLevel/" + data.node.original.doctypes_first_level_id )
.subscribe((data: any) => {
this.currentFirstLevel = data['firstLevel'];
this.folderTypes = data['folderTypes'];
}, (err) => {
this.notify.error(err.error.errors);
});
......@@ -413,7 +411,6 @@ export class DoctypesAdministrationComponent implements OnInit {
$j('#jstree').jstree('deselect_all');
this.http.get("../../rest/administration/doctypes/new")
.subscribe((data: any) => {
this.folderTypes = data['folderTypes'];
this.firstLevels = data['firstLevel'];
this.secondLevels = data['secondLevel'];
this.processModes = ['NORMAL', 'SVA', 'SVR'];
......
......@@ -1661,7 +1661,7 @@ export const LANG_FR = {
"downloadNumericPackage" : "Télécharger le pli numérique",
"actionsHistory" : "Historique des actions",
"noActionProcessed": "Aucune action effectuée",
"reconcileMsg": "Les courriers seront convertis en tant que <b>version signée</b> et liés au courrier qui sera sélectionnée.",
"reconcileMsg": "Les courriers seront convertis en tant que <b>version signée</b> et liés au courrier qui sera sélectionné.",
"reconcileMsg2": "Si vous sélectionnez un <b>courrier départ</b>, seul le <b>dernier courrier</b> sera converti en tant de version signée. Les autres seront <b>supprimés</b> !",
"selectMailToReconcile": "Veuillez sélectionner le courrier cible de la reconciliation",
"selectMailToReconcile": "Veuillez sélectionner le courrier cible de la réconciliation",
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment