notification fixes

entity/Notification_entity/Notification_entity.aod

@@ -15,7 +15,7 @@
       <recordContainer>db</recordContainer>
     </entityProvider>
     <entityField>
-      <name>UID</name>
+      <name>ID</name>
     </entityField>
     <entityField>
       <name>CONTENTID</name>
@@ -162,7 +162,7 @@
     <dbRecordContainer>
       <name>db</name>
       <alias>_____SYSTEMALIAS</alias>
-      <isPageable v="false" />
+      <fromClauseProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
       <conditionProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
       <orderClauseProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
       <linkInformation>
@@ -231,10 +231,6 @@
           <recordfield>ASYS_NOTIFICATIONCONTENTS.TYPECODE</recordfield>
           <isFilterable v="true" />
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>UID.value</name>
-          <recordfield>ASYS_NOTIFICATIONS.ID</recordfield>
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>USER.value</name>
           <recordfield>ASYS_NOTIFICATIONS.USERID</recordfield>
@@ -261,6 +257,10 @@
           <recordfield>ASYS_NOTIFICATIONS.RESOLVEDPRIORITY</recordfield>
           <isFilterable v="true" />
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ID.value</name>
+          <recordfield>ASYS_NOTIFICATIONS.ID</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>

entity/Notification_entity/recordcontainers/db/conditionProcess.js

+import("Sql_lib");
 import("system.result");
 import("system.vars");
 import("system.util");
@@ -6,4 +7,7 @@ import("system.tools");
 var user = tools.getCurrentUser();
 var userid = user["name"];
 
-result.object("ASYS_NOTIFICATIONS.CONTENTID = ASYS_NOTIFICATIONCONTENTS.CONTENTID and USERID = '" + userid + "'");
\ No newline at end of file
+var cond = SqlCondition.begin()
+                    .andPrepareIfSet("ASYS_NOTIFICATIONS.USERID", userid)
+
+result.object(cond.translate());
\ No newline at end of file

entity/Notification_entity/recordcontainers/db/fromClauseProcess.js

+import("system.result");
+
+result.string("ASYS_NOTIFICATIONS left join ASYS_NOTIFICATIONCONTENTS on ASYS_NOTIFICATIONS.CONTENTID = ASYS_NOTIFICATIONCONTENTS.CONTENTID");
\ No newline at end of file