Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MaarchCourrier
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Harbor Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maarch
MaarchCourrier
Commits
bc3f01eb
Verified
Commit
bc3f01eb
authored
5 years ago
by
Damien
Browse files
Options
Downloads
Patches
Plain Diff
FEAT #13531 TIME 0:20 Clear all lock interval
parent
9051db1c
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
sql/structure.sql
+1
-0
1 addition, 0 deletions
sql/structure.sql
src/frontend/app/process/process.component.ts
+3
-0
3 additions, 0 deletions
src/frontend/app/process/process.component.ts
src/frontend/app/signature-book.component.ts
+3
-0
3 additions, 0 deletions
src/frontend/app/signature-book.component.ts
with
7 additions
and
0 deletions
sql/structure.sql
+
1
−
0
View file @
bc3f01eb
...
@@ -396,6 +396,7 @@ CREATE TABLE entities
...
@@ -396,6 +396,7 @@ CREATE TABLE entities
archival_agency
character
varying
(
255
),
archival_agency
character
varying
(
255
),
archival_agreement
character
varying
(
255
),
archival_agreement
character
varying
(
255
),
folder_import
character
varying
(
64
),
folder_import
character
varying
(
64
),
external_id
jsonb
DEFAULT
'{}'
,
CONSTRAINT
entities_pkey
PRIMARY
KEY
(
entity_id
),
CONSTRAINT
entities_pkey
PRIMARY
KEY
(
entity_id
),
CONSTRAINT
entities_folder_import_unique_key
UNIQUE
(
folder_import
)
CONSTRAINT
entities_folder_import_unique_key
UNIQUE
(
folder_import
)
)
)
...
...
This diff is collapsed.
Click to expand it.
src/frontend/app/process/process.component.ts
+
3
−
0
View file @
bc3f01eb
...
@@ -514,6 +514,9 @@ export class ProcessComponent implements OnInit {
...
@@ -514,6 +514,9 @@ export class ProcessComponent implements OnInit {
this
.
currentResourceLock
=
setInterval
(()
=>
{
this
.
currentResourceLock
=
setInterval
(()
=>
{
this
.
http
.
put
(
`../../rest/resourcesList/users/
${
this
.
currentUserId
}
/groups/
${
this
.
currentGroupId
}
/baskets/
${
this
.
currentBasketId
}
/lock`
,
{
resources
:
[
this
.
currentResourceInformations
.
resId
]
}).
pipe
(
this
.
http
.
put
(
`../../rest/resourcesList/users/
${
this
.
currentUserId
}
/groups/
${
this
.
currentGroupId
}
/baskets/
${
this
.
currentBasketId
}
/lock`
,
{
resources
:
[
this
.
currentResourceInformations
.
resId
]
}).
pipe
(
catchError
((
err
:
any
)
=>
{
catchError
((
err
:
any
)
=>
{
if
(
err
.
status
==
403
)
{
clearInterval
(
this
.
currentResourceLock
);
}
this
.
notify
.
handleErrors
(
err
);
this
.
notify
.
handleErrors
(
err
);
return
of
(
false
);
return
of
(
false
);
})
})
...
...
This diff is collapsed.
Click to expand it.
src/frontend/app/signature-book.component.ts
+
3
−
0
View file @
bc3f01eb
...
@@ -207,6 +207,9 @@ export class SignatureBookComponent implements OnInit {
...
@@ -207,6 +207,9 @@ export class SignatureBookComponent implements OnInit {
this
.
currentResourceLock
=
setInterval
(()
=>
{
this
.
currentResourceLock
=
setInterval
(()
=>
{
this
.
http
.
put
(
`../../rest/resourcesList/users/
${
this
.
userId
}
/groups/
${
this
.
groupId
}
/baskets/
${
this
.
basketId
}
/lock`
,
{
resources
:
[
this
.
resId
]
}).
pipe
(
this
.
http
.
put
(
`../../rest/resourcesList/users/
${
this
.
userId
}
/groups/
${
this
.
groupId
}
/baskets/
${
this
.
basketId
}
/lock`
,
{
resources
:
[
this
.
resId
]
}).
pipe
(
catchError
((
err
:
any
)
=>
{
catchError
((
err
:
any
)
=>
{
if
(
err
.
status
==
403
)
{
clearInterval
(
this
.
currentResourceLock
);
}
this
.
notify
.
handleErrors
(
err
);
this
.
notify
.
handleErrors
(
err
);
return
of
(
false
);
return
of
(
false
);
})
})
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment