Merge pull request #807 from AtlasOfLivingAustralia/feature/#800_1

#800_1 : fix category option issue
AtlasOfLivingAustralia · Nov 30, 2023 · 6427066 · 6427066
2 parents 580ae4c + a5bf33d
commit 6427066
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/grails-app/assets/javascripts/profileEditor/controllers/AttachmentController.js b/grails-app/assets/javascripts/profileEditor/controllers/AttachmentController.js
@@ -91,13 +91,17 @@ profileEditor.controller("AttachmentUploadController", function (profileService,
     var pdfType = {key: "PDF", title: "PDF Document"};
     self.types = [pdfType, urlType];
 
+    self.metadata = angular.isDefined(attachment) ? _.clone(attachment) : {};
+
     if (self.categories == null) {
         profileService.getCategories().then(function (data) {
             self.categories = data.resp;
+            if (self.metadata.category == null) {
+                self.metadata.category = self.categories[0].value;
+            }
         });
     }
 
-    self.metadata = angular.isDefined(attachment) ? _.clone(attachment) : {};
     self.files = null;
     self.error = null;
     self.type = angular.isDefined(attachment.url) && attachment.url ? urlType.key : pdfType.key;

diff --git a/grails-app/assets/javascripts/profileEditor/templates/attachmentUpload.tpl.htm b/grails-app/assets/javascripts/profileEditor/templates/attachmentUpload.tpl.htm
@@ -82,9 +82,10 @@ <h4 class="modal-title">Add an attachment</h4>
                 <label for="category" class="col-sm-3 control-label">Category</label>
 
                 <div class="col-sm-9">
-                    <select id="category" ng-model="attachmentUploadCtrl.metadata.category"
-                            ng-options="category.key as category.value for category in attachmentUploadCtrl.categories" class="form-control">
+                    <select id="category" ng-model="attachmentUploadCtrl.metadata.category" class="form-control">
                         <option value="">Select a category</option>
+                        <option ng-repeat="category in attachmentUploadCtrl.categories | orderBy:'toString()'" value="{{category.key}}"
+                                ng-selected="attachmentUploadCtrl.metadata.category == category.key">{{category.key}}</option>
                     </select>
                 </div>
             </div>