From 16bd2141c85834e85002451a1490e971dc2e96de Mon Sep 17 00:00:00 2001 From: Gerard Date: Mon, 26 Nov 2018 13:12:59 +0100 Subject: [PATCH] #869 refactor componente log --- client/client/src/locale/es.yml | 3 ++- client/core/src/components/log/index.html | 4 ++-- client/core/src/components/log/locale/es.yml | 3 ++- client/item/routes.json | 12 +----------- client/item/src/item.js | 2 +- client/ticket/src/locale/es.yml | 1 + 6 files changed, 9 insertions(+), 16 deletions(-) diff --git a/client/client/src/locale/es.yml b/client/client/src/locale/es.yml index d23d734b32..917e440a91 100644 --- a/client/client/src/locale/es.yml +++ b/client/client/src/locale/es.yml @@ -54,4 +54,5 @@ Edit contract: Editar contrato Requested credits: Créditos solicitados Contacts: Contactos Samples: Plantillas -Send sample: Enviar plantilla \ No newline at end of file +Send sample: Enviar plantilla +Log: Historial \ No newline at end of file diff --git a/client/core/src/components/log/index.html b/client/core/src/components/log/index.html index bcd7218187..00293b793c 100644 --- a/client/core/src/components/log/index.html +++ b/client/core/src/components/log/index.html @@ -9,7 +9,7 @@ Changed by Model Action - Instance + Name Before After @@ -32,7 +32,7 @@ {{::log.action}}
- Instance: + Name: {{::log.changedModelValue}}
diff --git a/client/core/src/components/log/locale/es.yml b/client/core/src/components/log/locale/es.yml index 75deeb63b4..2349be4dd0 100644 --- a/client/core/src/components/log/locale/es.yml +++ b/client/core/src/components/log/locale/es.yml @@ -6,4 +6,5 @@ After: Despues History: Historial insert: Crear delete: Eliminar -update: Actualizar \ No newline at end of file +update: Actualizar +Name: Nombre \ No newline at end of file diff --git a/client/item/routes.json b/client/item/routes.json index d5a098934c..f7ac8ebb79 100644 --- a/client/item/routes.json +++ b/client/item/routes.json @@ -55,16 +55,7 @@ "component": "vn-item-tax", "description": "Tax", "acl": ["administrative","buyer"] - }, - { - "url" : "/history", - "state": "item.card.history", - "component": "vn-item-history", - "description": "History", - "params": { - "item": "$ctrl.item" - } - }, + }, { "url" : "/niche", "state": "item.card.niche", @@ -129,7 +120,6 @@ {"state": "item.card.data", "icon": "settings"}, {"state": "item.card.tags", "icon": "icon-tags"}, {"state": "item.card.tax", "icon": "icon-tax"}, - {"state": "item.card.history", "icon": "history"}, {"state": "item.card.niche", "icon": "place"}, {"state": "item.card.botanical", "icon": "local_florist"}, {"state": "item.card.itemBarcode", "icon": "icon-barcode"}, diff --git a/client/item/src/item.js b/client/item/src/item.js index bcbce82fdf..4a5db10bf4 100644 --- a/client/item/src/item.js +++ b/client/item/src/item.js @@ -12,7 +12,7 @@ import './ticket-descriptor-popover'; import './data'; import './tags'; import './tax'; -import './history'; +// import './history'; import './last-entries'; import './niche'; import './botanical'; diff --git a/client/ticket/src/locale/es.yml b/client/ticket/src/locale/es.yml index a1d4bafcff..b56740e7b9 100644 --- a/client/ticket/src/locale/es.yml +++ b/client/ticket/src/locale/es.yml @@ -74,3 +74,4 @@ Sale checked: Control clientes Components: Componentes Sale tracking: Líneas preparadas Pictures: Fotos +Log: Historial \ No newline at end of file