correct sql function to handle multiple activity types

diff --git a/enyo-client/application/source/models/activity.js b/enyo-client/application/source/models/activity.js
index dfcede8..dcb5836 100644 (file)
--- a/enyo-client/application/source/models/activity.js
+++ b/enyo-client/application/source/models/activity.js
@@ -99,7 +99,7 @@ white:true*/
       return fn ? fn.call(this) : this.get("status");
     },
 
-    // XXX TODO - need to create a privilege first
+    // XXX/TODO - need to create a privileges for activity and check them here
     canReassign: function (callback) {
       if (callback) {
         callback(true);

diff --git a/enyo-client/application/source/views/list.js b/enyo-client/application/source/views/list.js
index 158c23b..f0a9829 100644 (file)
--- a/enyo-client/application/source/views/list.js
+++ b/enyo-client/application/source/views/list.js
@@ -7,7 +7,7 @@ Globalize:true, async:true, console:true*/
 (function () {
 
   // ..........................................................
-  // ACCOUNT
+  // EMAIL
   //
 
   /**

diff --git a/enyo-client/application/source/widgets/picker.js b/enyo-client/application/source/widgets/picker.js
index ddceb40..9ae1568 100644 (file)
--- a/enyo-client/application/source/widgets/picker.js
+++ b/enyo-client/application/source/widgets/picker.js
@@ -798,10 +798,11 @@ regexp:true, undef:true, trailing:true, white:true, strict:false */
   enyo.kind({
     name: "XV.UserPicker",
     kind: "XV.PickerWidget",
-    collection: "XM.users"
-    /*orderBy: [
+    collection: "XM.users",
+    nameAttribute: "username",
+    orderBy: [
       {attribute: 'username'}
-    ]*/
+    ]
   });
 
   // ..........................................................

diff --git a/enyo-client/database/source/xm/javascript/activity.sql b/enyo-client/database/source/xm/javascript/activity.sql
index b978669..310b9bc 100644 (file)
--- a/enyo-client/database/source/xm/javascript/activity.sql
+++ b/enyo-client/database/source/xm/javascript/activity.sql
@@ -11,7 +11,7 @@ select xt.install_js('XM','Activity','xtuple', $$
       i, 
       sql,
       sql2,
-      acttype;
+      actType;
 
     sql = "select acttype_nsname as nsname, " + 
           " acttype_tblname as tblname, " + 
@@ -20,13 +20,6 @@ select xt.install_js('XM','Activity','xtuple', $$
           "join xt.act on act_type = acttype_code " + 
           "where act_uuid = $1; ";
 
-    /**
-      Activities can be incidents, orders, workflows, etc. So we need to dynamically build this query.
-      sql2 ex. "update xt.wowf set wf_assigned_username = 'postgres' 
-      where xt.wowf.obj_uuid = '7551c4e4-ea5e-4192-8dbf-7305448f5a3e'"; 
-    */
-    sql2 = "update {table} set {colname} = $1 where obj_uuid = $2; ";
-
     /* Make into an array if an array not passed */
     if (typeof arguments[0] !== "object") {
       ary = [{activityId: activityId, username: username}];
@@ -34,20 +27,29 @@ select xt.install_js('XM','Activity','xtuple', $$
       ary = arguments;
     }
 
-    /* Make sure user can do this */
+    /** TODO - check for privilege after privilege created for activity
     if (!XT.Data.checkPrivilege("EnterReceipts")) { throw new handleError("Access Denied", 401); }
+    */
 
     for (i = 0; i < ary.length; i++) {
       act = ary[i];
-      acttype = plv8.execute(sql, [act.activityId])[0];
+      actType = plv8.execute(sql, [act.activityId])[0];
 
-      /* TODO - need more error handling */
-      if (!acttype) {
+      /* TODO - may need more error handling */
+      if (!actType || !actType.nsname || !actType.tblname || !actType.colname) {
         throw new handleError("activity type not found in xt.acttype", 400);
-      }
+      } 
       
-      sql2 = sql2.replace(/{table}/g, acttype.nsname + "." + acttype.tblname);
-      sql2 = sql2.replace(/{colname}/g, acttype.colname);
+      /**
+        Activities can be incidents, orders, workflows, etc. 
+        So we need to dynamically build this query. 
+        sql2 ex. "update xt.wowf set wf_assigned_username = 'postgres' 
+        where xt.wowf.obj_uuid = '7551c4e4-ea5e-4192-8dbf-7305448f5a3e'"; 
+      */
+      sql2 = "update " + actType.nsname + "." + actType.tblname + 
+             " set " + actType.colname + " = $1 " + 
+             "where obj_uuid = $2; ";
+
       plv8.execute(sql2, [act.username, act.activityId])[0];
     }
     return;