Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openolat
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zentraler Informatikdienst
Digitale Medien und Lerntechnologien
olat
openolat
Commits
c8c4f6d7
Commit
c8c4f6d7
authored
4 years ago
by
uhensler
Browse files
Options
Downloads
Patches
Plain Diff
OO-4719: Typos
parent
5f38d2ff
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/org/olat/upgrade/OLATUpgrade_15_0_3.java
+4
-9
4 additions, 9 deletions
src/main/java/org/olat/upgrade/OLATUpgrade_15_0_3.java
with
4 additions
and
9 deletions
src/main/java/org/olat/upgrade/OLATUpgrade_15_0_3.java
+
4
−
9
View file @
c8c4f6d7
...
@@ -33,7 +33,6 @@ import org.olat.core.id.Identity;
...
@@ -33,7 +33,6 @@ import org.olat.core.id.Identity;
import
org.olat.core.logging.Tracing
;
import
org.olat.core.logging.Tracing
;
import
org.olat.core.logging.activity.LoggingObject
;
import
org.olat.core.logging.activity.LoggingObject
;
import
org.olat.core.util.StringHelper
;
import
org.olat.core.util.StringHelper
;
import
org.olat.course.nodes.livestream.manager.LiveStreamLaunchDAO
;
import
org.olat.modules.assessment.AssessmentEntry
;
import
org.olat.modules.assessment.AssessmentEntry
;
import
org.olat.modules.assessment.AssessmentService
;
import
org.olat.modules.assessment.AssessmentService
;
import
org.olat.repository.RepositoryEntry
;
import
org.olat.repository.RepositoryEntry
;
...
@@ -50,10 +49,8 @@ public class OLATUpgrade_15_0_3 extends OLATUpgrade {
...
@@ -50,10 +49,8 @@ public class OLATUpgrade_15_0_3 extends OLATUpgrade {
private
static
final
Logger
log
=
Tracing
.
createLoggerFor
(
OLATUpgrade_15_0_3
.
class
);
private
static
final
Logger
log
=
Tracing
.
createLoggerFor
(
OLATUpgrade_15_0_3
.
class
);
private
static
final
int
BATCH_SIZE
=
100
;
private
static
final
String
VERSION
=
"OLAT_15.0.3"
;
private
static
final
String
VERSION
=
"OLAT_15.0.3"
;
private
static
final
String
LIVE_STREAM_LAUNCHE
S
=
"ASSESSMENT LAST ATTEMPTS"
;
private
static
final
String
ASSESSMENT_LAST_ATTEMPT
S
=
"ASSESSMENT LAST ATTEMPTS"
;
@Autowired
@Autowired
private
DB
dbInstance
;
private
DB
dbInstance
;
...
@@ -62,8 +59,6 @@ public class OLATUpgrade_15_0_3 extends OLATUpgrade {
...
@@ -62,8 +59,6 @@ public class OLATUpgrade_15_0_3 extends OLATUpgrade {
@Autowired
@Autowired
private
RepositoryEntryDAO
repositoryEntryDao
;
private
RepositoryEntryDAO
repositoryEntryDao
;
@Autowired
@Autowired
private
LiveStreamLaunchDAO
liveStreamLaunchDao
;
@Autowired
private
BaseSecurity
securityManager
;
private
BaseSecurity
securityManager
;
public
OLATUpgrade_15_0_3
()
{
public
OLATUpgrade_15_0_3
()
{
...
@@ -93,14 +88,14 @@ public class OLATUpgrade_15_0_3 extends OLATUpgrade {
...
@@ -93,14 +88,14 @@ public class OLATUpgrade_15_0_3 extends OLATUpgrade {
if
(
allOk
)
{
if
(
allOk
)
{
log
.
info
(
Tracing
.
M_AUDIT
,
"Finished OLATUpgrade_15_0_3 successfully!"
);
log
.
info
(
Tracing
.
M_AUDIT
,
"Finished OLATUpgrade_15_0_3 successfully!"
);
}
else
{
}
else
{
log
.
info
(
Tracing
.
M_AUDIT
,
"OLATUpgrade_1
4
_0_3 not finished, try to restart OpenOlat!"
);
log
.
info
(
Tracing
.
M_AUDIT
,
"OLATUpgrade_1
5
_0_3 not finished, try to restart OpenOlat!"
);
}
}
return
allOk
;
return
allOk
;
}
}
private
boolean
migrateLastAttempts
(
UpgradeManager
upgradeManager
,
UpgradeHistoryData
uhd
)
{
private
boolean
migrateLastAttempts
(
UpgradeManager
upgradeManager
,
UpgradeHistoryData
uhd
)
{
boolean
allOk
=
true
;
boolean
allOk
=
true
;
if
(!
uhd
.
getBooleanDataValue
(
LIVE_STREAM_LAUNCHE
S
))
{
if
(!
uhd
.
getBooleanDataValue
(
ASSESSMENT_LAST_ATTEMPT
S
))
{
try
{
try
{
List
<
LoggingObject
>
loggedLaunches
=
getLoggedLastAttempts
();
List
<
LoggingObject
>
loggedLaunches
=
getLoggedLastAttempts
();
migrateLoggedAttempts
(
loggedLaunches
);
migrateLoggedAttempts
(
loggedLaunches
);
...
@@ -111,7 +106,7 @@ public class OLATUpgrade_15_0_3 extends OLATUpgrade {
...
@@ -111,7 +106,7 @@ public class OLATUpgrade_15_0_3 extends OLATUpgrade {
log
.
error
(
""
,
e
);
log
.
error
(
""
,
e
);
allOk
=
false
;
allOk
=
false
;
}
}
uhd
.
setBooleanDataValue
(
LIVE_STREAM_LAUNCHE
S
,
allOk
);
uhd
.
setBooleanDataValue
(
ASSESSMENT_LAST_ATTEMPT
S
,
allOk
);
upgradeManager
.
setUpgradesHistory
(
uhd
,
VERSION
);
upgradeManager
.
setUpgradesHistory
(
uhd
,
VERSION
);
}
}
return
allOk
;
return
allOk
;
...
...
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