Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Maarch
maarchRM
Commits
4d965a64
Commit
4d965a64
authored
Nov 20, 2020
by
Jerome Boucher
Browse files
Merge branch 'Support/2.7.X' into 'master'
Support/2.7.x See merge request
!612
parents
0169cff7
3b0ca6ed
Pipeline
#10367
failed with stages
in 49 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
src/presentation/maarchRM/Resources/view/recordsManagement/archive/search.html
View file @
4d965a64
...
...
@@ -257,8 +257,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
);
...
...
@@ -278,5 +277,18 @@
}
});
$
(
"
#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>
src/presentation/maarchRM/Resources/view/recordsManagement/archive/searchform.html
View file @
4d965a64
...
...
@@ -39,20 +39,23 @@
<div
class=
"form-group"
>
<label
class=
"col-sm-4 control-label"
>
Producer
</label>
<div
class=
"col-sm-8"
>
<input
type=
"text"
class=
"form-control orgHide"
placeholder=
"Producer"
name=
"or
gTypeahead
"
<input
type=
"text"
class=
"form-control orgHide"
placeholder=
"Producer"
name=
"or
iginatorOwnerOrgRegNumber
"
id=
"orgTypeahead"
/>
<select
class=
"form-control hide"
name=
"originatorOwnerOrgId"
id=
"originatorOwnerOrgId"
>
<option
value=
""
>
All
</option>
<?merge organizationsOriginator ?>
<option
value=
"[?merge .orgId ?]"
>
<?merge .displayName ?>
</option>
<div>
<?merge .originators ?>
<option
value=
"[?merge .orgId ?]"
>
<?merge .displayName ?>
</option>
</div>
</select>
<select
class=
"form-control hide"
name=
"originatorOrgRegNumber"
id=
"originatorOrgRegNumber"
>
<option
value=
""
>
All
</option>
<?merge organizationsOriginator ?>
<div>
<?merge .originator
.isset() then(.originator, .originators)
?>
<?merge .originator
s
?>
<option
value=
"[?merge .registrationNumber ?]"
orgId=
"[?merge .ownerOrgId ?]"
>
<?merge .displayName ?>
</option>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment