Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
deadlock-desktop
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
deadlock-public
deadlock-desktop
Commits
0eceb22f
Commit
0eceb22f
authored
Jul 7, 2022
by
Guillaume WEBER
Committed by
Mohamed AZIKIOU
Jul 8, 2022
Browse files
Options
Downloads
Patches
Plain Diff
fix: prevent reviewer from pushing code or updating time spent
parent
c82a971c
No related branches found
No related tags found
1 merge request
!36
fix: prevent reviewer from pushing code or updating time spent
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
deadlock-plugins/deadlock-extension/src/extension.ts
+3
-6
3 additions, 6 deletions
deadlock-plugins/deadlock-extension/src/extension.ts
deadlock-plugins/deadlock-extension/src/recorder/recorder.ts
+5
-1
5 additions, 1 deletion
deadlock-plugins/deadlock-extension/src/recorder/recorder.ts
with
8 additions
and
7 deletions
deadlock-plugins/deadlock-extension/src/extension.ts
+
3
−
6
View file @
0eceb22f
import
{
window
,
ExtensionContext
,
workspace
,
commands
}
from
'
vscode
'
;
import
Controller
from
'
./core/controller
'
;
import
isDocker
from
'
./core/utils/isdocker
'
;
import
Recorder
,
{
runTimer
}
from
'
./recorder/recorder
'
;
import
Recorder
from
'
./recorder/recorder
'
;
import
{
extensionError
as
error
}
from
'
./recorder/utils/log
'
;
import
{
DepNodeProvider
}
from
'
./view/deadlockPanel
'
;
import
{
CommandTreeProvider
}
from
'
./view/CommandTree
'
;
...
...
@@ -20,10 +20,6 @@ export async function activate(context: ExtensionContext) {
if
(
isDocker
())
{
commands
.
executeCommand
(
'
setContext
'
,
'
deadlock.inContainer
'
,
true
);
window
.
registerTreeDataProvider
(
'
commandTree
'
,
new
CommandTreeProvider
(
context
));
}
else
{
commands
.
executeCommand
(
'
setContext
'
,
'
deadlock.inContainer
'
,
false
);
}
if
(
isDocker
())
{
try
{
Recorder
.
instance
.
run
();
}
catch
(
e
)
{
...
...
@@ -31,6 +27,7 @@ export async function activate(context: ExtensionContext) {
error
(
JSON
.
stringify
(
e
));
window
.
showErrorMessage
(
"
Le recorder n'a pas pu être lancé
"
);
}
runTimer
();
}
else
{
commands
.
executeCommand
(
'
setContext
'
,
'
deadlock.inContainer
'
,
false
);
}
}
This diff is collapsed.
Click to expand it.
deadlock-plugins/deadlock-extension/src/recorder/recorder.ts
+
5
−
1
View file @
0eceb22f
...
...
@@ -68,7 +68,8 @@ export default class Recorder {
await
this
.
setupFromRemoteRepo
(
this
.
_gitMission
);
await
this
.
setupProject
(
this
.
_gitMission
);
try
{
if
(
ENABLE_AUTOMATIC_SAVE
)
new
AutomaticSave
(
MISSION_PATH_IC
,
this
.
_gitMission
);
if
(
ENABLE_AUTOMATIC_SAVE
&&
!
this
.
userMission
.
isReviewing
())
new
AutomaticSave
(
MISSION_PATH_IC
,
this
.
_gitMission
);
}
catch
(
e
)
{
error
(
'
Error while setup automatic save
'
);
error
(
e
);
...
...
@@ -77,6 +78,9 @@ export default class Recorder {
error
(
'
Cannot setup user repo.
'
);
error
(
e
);
}
if
(
!
this
.
userMission
.
isReviewing
())
{
runTimer
();
}
}
}
...
...
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