diff --git a/ayanova/src/api/gzutil.js b/ayanova/src/api/gzutil.js
index 1e7ea8d3..51ecbd2f 100644
--- a/ayanova/src/api/gzutil.js
+++ b/ayanova/src/api/gzutil.js
@@ -164,7 +164,6 @@ export default {
return "fa-vial";
case window.$gz.type.ServerState:
return "fa-door-open";
-
case window.$gz.type.License:
return "fa-ticket-alt";
case window.$gz.type.LogFile:
diff --git a/ayanova/src/views/ay-history.vue b/ayanova/src/views/ay-history.vue
index 8aba2108..88263c20 100644
--- a/ayanova/src/views/ay-history.vue
+++ b/ayanova/src/views/ay-history.vue
@@ -10,17 +10,23 @@
:color="getIconColorForEvent(i.event)"
:icon="getIconForEvent(i.event)"
>
-
-
-
{{
+ >{{ getIconForObjectType(i.objectType) }}{{
getIconForObjectType(i.objectType)
}}{{ i.name }}{{ getNameForType(i.objectType) }}{{ i.name }}
+ {{ i }}
{{ i.date }} {{ getEventName(i.event) }}
{{ i.textra }}
@@ -72,6 +78,17 @@ export default {
};
},
methods: {
+ openItem(item) {
+ if (item.canopen) {
+ window.$gz.eventBus.$emit("openobject", {
+ type: item.objectType,
+ id: item.objectId
+ });
+ }
+ },
+ canOpen(otype) {
+ return this.ayaTypes[otype].canopen;
+ },
getEventName(event) {
return this.eventTypes[event].name;
},
@@ -85,9 +102,9 @@ export default {
return null;
}
},
- getTypeNameForEvent(event) {
- if (event.objectType) {
- return this.ayaTypes[event.objectType].name;
+ getNameForType(otype) {
+ if (otype) {
+ return this.ayaTypes[otype].name;
} else {
return null;
}
@@ -161,7 +178,9 @@ export default {
languageName,
hour12
);
- for (let i = 0; i < vm.eventTypes.length; i) temp[i].index = i; //TODO: PAGING
+ //for (let i = 0; i < vm.eventTypes.length; i) {
+ temp[i].index = i; //TODO: PAGING
+ //}
}
vm.obj = temp; //TODO: PAGING
@@ -242,18 +261,28 @@ function initForm(vm) {
//
//
function populateAyaTypeList(vm) {
- //ensure the pick lists required are pre-fetched
return window.$gz.enums.fetchEnumList("ayatype").then(() => {
let ayt = window.$gz.enums.getSelectionList("ayatype");
let temp = {};
for (let i = 0; i < ayt.length; i++) {
let item = ayt[i];
+ let canopen = false;
+ //CoreBizObject add here
+ switch (item.id) {
+ case window.$gz.type.User:
+ case window.$gz.type.Widget:
+ canopen = true;
+ break;
+ default:
+ canopen = false;
+ }
temp[item.id] = {
name: item.name,
- icon: window.$gz.util.iconForType(item.id)
+ icon: window.$gz.util.iconForType(item.id),
+ canopen: canopen
};
- vm.ayaTypes = temp;
}
+ vm.ayaTypes = temp;
});
}