Merge branch 'Support/2.7.X' into 'master'

Support/2.7.x

See merge request maarch/archivesPubliques!215

presentation/maarchRM/Presenter/archivesPubliques/content.php

@@ -194,10 +194,10 @@ class content
 
                         $userOrgs[(string) $orgObject->orgId] = new \stdClass();
                         $userOrgs[(string) $orgObject->orgId]->displayName = $orgObject->displayName;
-                        $userOrgs[(string) $orgObject->orgId]->{$role} = [];
+                        $userOrgs[(string) $orgObject->orgId]->originators = [];
                     }
-                    if (!in_array($orgUnit,$userOrgs[(string) $orgObject->orgId]->{$role})) {
-                        $userOrgs[(string)$orgObject->orgId]->{$role}[] = $orgUnit;
+                    if (!in_array($orgUnit, $userOrgs[(string) $orgObject->orgId]->originators)) {
+                        $userOrgs[(string)$orgObject->orgId]->originators[] = $orgUnit;
                     }
                 }
             }

presentation/maarchRM/Resources/view/archivesPubliques/contentDescription/search.html

@@ -389,7 +389,7 @@
             if ($(e.target).val().length <= 2) {
                 $("#originatorOwnerOrgName").val("");
             }
-        })
+        });
 
         // initialize typeahead
         $('#orgTypeahead').typeahead(
@@ -425,7 +425,7 @@
                 skipCache: true
             }
         ).on('typeahead:selected', function($event, suggestion, source) {
-            if(suggestion.ownerOrgId) {
+            if(suggestion.orgId) {
                 $("#originatorOrgRegNumber").val(suggestion.registrationNumber);
                 $("#originatorOrgInfo").show();
                 $("#originatorOwnerOrgName").val(suggestion.ownerOrgName);
@@ -439,12 +439,24 @@
         });
 
         $('#orgTypeahead').keyup(function () {
-
             if(!$(this).val()) {
                 $("#originatorOrgInfo").hide();
             }
         });
 
+        $("#orgTypeahead").keydown(function(event) {
+            // reinit typeahead and hidden input when suppr or backspace keys are pressed
+            if (event.which == 46 || event.which == 8) {
+                $("#originatorOrgRegNumber").val('');
+                $("#originatorOwnerOrgId").val('');
+            }
+        });
+
+        $("#orgTypeahead").click(function() {
+            $("#originatorOrgRegNumber").val('');
+            $("#originatorOwnerOrgId").val('');
+        });
+
     </script>
 </div>
 <!-- <script src="/public/js/bootstrap-toggle/bootstrap-toggle.js"></script> -->