ayanova/src/views/adm-user.vue

@@ -913,14 +913,18 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         if (m.id != null) {
-          //last report selected
+          //last report selected is in m.id
           m.vm.$router.push({
             name: "ay-report",
             params: { recordid: m.id, ayatype: window.$gz.type.User }
           });
         } else {
           //general report selector chosen
-          let res = await m.vm.$refs.reportSelector.open();
+
+          let res = await m.vm.$refs.reportSelector.open({
+            ObjectType: window.$gz.type.User,
+            selectedRowIds: [m.vm.obj.id]
+          });
 
           //if null for no selection
           //just bail out
@@ -937,6 +941,7 @@ async function clickHandler(menuItem) {
           });
         }
         break;
+
       case "directnotify":
         //nav to direct notify with list of users appended to route
         if (m.vm.obj.id == 0) {

ayanova/src/views/adm-users.vue

@@ -11,7 +11,6 @@
       hide-default-footer
       @click:row="rowClick"
       :sort-by="['name']"
-      show-select
       :header-props="{ sortByText: $ay.t('Sort') }"
       data-cy="usersTable"
     >
@@ -223,20 +222,24 @@ function generateMenu(vm) {
   }
 
   //STUB REPORTS
-  //Report not Print, print is a further option
-  menuOptions.menuItems.push({
-    title: "Report",
-    icon: "$ayiFileAlt",
-    key: FORM_KEY + ":report",
-    vm: vm
-  });
+  //## NOTE: This form is not based on a DataList so it cannot be printed
+  //if it was a datalist then all would be as normal
+  //not sure why it's not a datalist
 
-  menuOptions.menuItems.push({
-    title: "stub: Last report used",
-    icon: "$ayiFileAlt",
-    key: FORM_KEY + ":report:STUBlastusedreportid",
-    vm: vm
-  });
+  //Report not Print, print is a further option
+  // menuOptions.menuItems.push({
+  //   title: "Report",
+  //   icon: "$ayiFileAlt",
+  //   key: FORM_KEY + ":report",
+  //   vm: vm
+  // });
+
+  // menuOptions.menuItems.push({
+  //   title: "stub: Last report used",
+  //   icon: "$ayiFileAlt",
+  //   key: FORM_KEY + ":report:STUBlastusedreportid",
+  //   vm: vm
+  // });
 
   // menuOptions.menuItems.push({
   //   title: "Extensions",

ayanova/src/views/cust-user.vue

@@ -917,14 +917,18 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         if (m.id != null) {
-          //last report selected
+          //last report selected is in m.id
           m.vm.$router.push({
             name: "ay-report",
             params: { recordid: m.id, ayatype: window.$gz.type.User }
           });
         } else {
           //general report selector chosen
-          let res = await m.vm.$refs.reportSelector.open();
+
+          let res = await m.vm.$refs.reportSelector.open({
+            ObjectType: window.$gz.type.User,
+            selectedRowIds: [m.vm.obj.id]
+          });
 
           //if null for no selection
           //just bail out