Merge remote-tracking branch 'origin/main'

mchapman · mchapman · commit 9c1b190f40f7 · 2025-03-25T02:58:10.000Z
diff --git a/src/client/index.d.ts b/src/client/index.d.ts
@@ -759,6 +759,7 @@ declare module fng {
     readRecord: (modelName: string, id: string, formName?: string) => angular.IHttpPromise<any>;
     getAll: (modelName: string, _options: any) => angular.IHttpPromise<any[]>;
     getAllListAttributes: (ref: string) => angular.IHttpPromise<ILookupItem[]>;
+    getAllPickListAttributes: (ref: string) => angular.IHttpPromise<ILookupItem[]>;
     getPagedAndFilteredList: (
       modelName: string,
       options: IListQueryOptions
diff --git a/src/client/js/services/record-handler.ts b/src/client/js/services/record-handler.ts
@@ -769,7 +769,7 @@ module fng.services {
         $scope.$watch(
           "record",
           function (newValue, oldValue) {
-              if ($scope.phase === "ready" && !$scope.dirtyChecked && Object.keys(oldValue).length > 0 && $scope.topLevelFormName && $scope[$scope.topLevelFormName].$dirty && typeof $scope.dataEventFunctions?.checkDirty === "function") {
+              if ($scope.phase === "ready" && !$scope.dirtyChecked && Object.keys(oldValue).length > 0 && $scope.topLevelFormName && $scope[$scope.topLevelFormName] && $scope[$scope.topLevelFormName].$dirty && typeof $scope.dataEventFunctions?.checkDirty === "function") {
                 $scope.dirtyChecked = true;
                 // An opportunity to ask whether we can edit this document or not - pessimistic locking can be implemented by using this
                 const checkDirty = $scope.dataEventFunctions.checkDirty(newValue, oldValue);
diff --git a/src/client/js/services/submissions.ts b/src/client/js/services/submissions.ts
@@ -130,9 +130,14 @@ module fng.services {
       },
 
       // return only the list attributes for ALL records in the given collection, returning ILookupItem[]
+      // getAllPickListAttributes() is intended to be used to retrieve records for display in a picklist;
+      // getAllListAttributes() for all other use cases
       getAllListAttributes: function (ref: string): angular.IHttpPromise<ILookupItem[]> {
         return $http.get(`/api/${ref}/listAll`, { cache: expCache });
       },
+      getAllPickListAttributes: function (ref: string): angular.IHttpPromise<ILookupItem[]> {
+        return $http.get(`/api/${ref}/picklistAll`, { cache: expCache });
+      },
 
       // return only the list attributes for records in the given collection that satisfy the given query conditions (filter, limit etc.)
       // return ILookupItem[] if options.concatenate is true, else the raw documents
diff --git a/src/server/data_form.ts b/src/server/data_form.ts
@@ -150,7 +150,9 @@ export class FormsAngular {
       processArgs(this.options, [resourceName, this.collectionGet()])
     );
 
-    // return the List attributes for all records - used by record-handler's setUpLookupOptions() method, for cases
+    // return the List attributes for all records.  two endpoints that go through the same handler so permissions
+    // can be applied differently for the two use cases.  /listAll is intended for listing records on a page;
+    // /picklistAll for listing them in a <select> or similar - used by record-handler's setUpLookupOptions() method, for cases
     // where there's a lookup that doesn't use the fngajax option
     this.app.get.apply(
       this.app,
@@ -159,6 +161,13 @@ export class FormsAngular {
         this.entityListAll(),
       ])
     );
+    this.app.get.apply(
+        this.app,
+        processArgs(this.options, [
+          resourceName + "/picklistAll",
+          this.entityListAll(),
+        ])
+      );
 
     // return the List attributes for a record - used by fng-ui-select
     this.app.get.apply(
