[front: editLog] nicer action select

SciencesPo · Aug 31, 2017 · f610b81 · f610b81
1 parent 2b3620f
commit f610b81
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/client/src/app/log-table/log-table.component.html b/client/src/app/log-table/log-table.component.html
@@ -3,10 +3,11 @@
   <thead>
     <tr>
       <th>{{ 'editLogs.date' | translate }}</th>
-      <th>{{ 'editLogs.object' | translate }}</th>
+      <th>{{ 'editLogs.object.' + feature | translate }}</th>
       <th>
         <md-select [placeholder]="'editLogs.action' | translate" [formControl]="filterForm.controls['action']" *ngIf="filterForm.controls['action']">
-          <md-option *ngFor="let action of actions" [value]="action.value">{{ 'editLogs.actions.' + action.label | translate }}</md-option>
+            <md-option>{{ 'editLogs.actions.all' | translate }}</md-option>
+          <md-option *ngFor="let action of actions" [value]="action">{{ 'editLogs.actions.' + action | translate }}</md-option>
         </md-select>
       </th>
 

diff --git a/client/src/app/log-table/log-table.component.ts b/client/src/app/log-table/log-table.component.ts
@@ -10,12 +10,12 @@ import { Component, Input, OnInit, Output, EventEmitter, OnChanges } from '@angu
 })
 export class LogTableComponent implements OnInit {
 
-  actions = [
-    { value: '', label: 'all' },
-    { value: 'create', label: 'create' },
-    { value: 'update', label: 'update' },
-    { value: 'delete', label: 'delete' }
-  ];
+  actions = ['create', 'update', 'delete'];
+  //   { value: '', label: 'all' },
+  //   { value: 'create', label: 'create' },
+  //   { value: 'update', label: 'update' },
+  //   { value: 'delete', label: 'delete' }
+  // ];
   field: { api: any, src: any, stringValue: any } = { api: null, src: null, stringValue: null };
 
   filterForm: FormGroup;

diff --git a/client/src/assets/i18n/fr.json b/client/src/assets/i18n/fr.json
@@ -63,12 +63,16 @@
   "user_guide": "Guide utilisateur",
   "fields_list": "Liste des champs",
   "editLogs": {
-    "who": "Qui",
+    "who": "Modifié par",
     "date": "Date",
     "action": "Action",
     "role": "Rôle",
     "lab": "Organisation",
     "fields": "Champs modifiés",
+    "object": {
+      "people": "Membre",
+      "organization": "Organisation"
+    },
     "actions": {
       "create": "Création",
       "update": "Édition",