Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OLAT CI-CD Testing Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
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
Lars Oliver Dam
OLAT CI-CD Testing Project
Commits
26e4239f
Commit
26e4239f
authored
10 years ago
by
srosse
Browse files
Options
Downloads
Patches
Plain Diff
OO-1478: create the versions folder during import, double check if the 3 directories exists
parent
a8c8c66b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/org/olat/modules/wiki/Wiki.java
+4
-3
4 additions, 3 deletions
src/main/java/org/olat/modules/wiki/Wiki.java
src/main/java/org/olat/modules/wiki/WikiManager.java
+2
-0
2 additions, 0 deletions
src/main/java/org/olat/modules/wiki/WikiManager.java
with
6 additions
and
3 deletions
src/main/java/org/olat/modules/wiki/Wiki.java
+
4
−
3
View file @
26e4239f
...
@@ -49,6 +49,7 @@ import org.olat.core.util.Formatter;
...
@@ -49,6 +49,7 @@ import org.olat.core.util.Formatter;
import
org.olat.core.util.vfs.VFSContainer
;
import
org.olat.core.util.vfs.VFSContainer
;
import
org.olat.core.util.vfs.VFSItem
;
import
org.olat.core.util.vfs.VFSItem
;
import
org.olat.core.util.vfs.VFSLeaf
;
import
org.olat.core.util.vfs.VFSLeaf
;
import
org.olat.core.util.vfs.VFSManager
;
import
org.olat.core.util.vfs.filters.VFSLeafFilter
;
import
org.olat.core.util.vfs.filters.VFSLeafFilter
;
import
org.olat.modules.wiki.gui.components.wikiToHtml.FilterUtil
;
import
org.olat.modules.wiki.gui.components.wikiToHtml.FilterUtil
;
import
org.olat.modules.wiki.versioning.ChangeInfo
;
import
org.olat.modules.wiki.versioning.ChangeInfo
;
...
@@ -82,9 +83,9 @@ public class Wiki implements WikiContainer, Serializable {
...
@@ -82,9 +83,9 @@ public class Wiki implements WikiContainer, Serializable {
if
(
wikiRootContainer
==
null
)
throw
new
AssertException
(
"null values are not allowed for the wiki constructor!"
);
if
(
wikiRootContainer
==
null
)
throw
new
AssertException
(
"null values are not allowed for the wiki constructor!"
);
wikiPages
=
Collections
.
synchronizedMap
(
new
HashMap
<
String
,
WikiPage
>());
wikiPages
=
Collections
.
synchronizedMap
(
new
HashMap
<
String
,
WikiPage
>());
this
.
diffService
=
WikiManager
.
getInstance
().
getDiffService
();
this
.
diffService
=
WikiManager
.
getInstance
().
getDiffService
();
versionsContainer
=
(
VFSContainer
)
wikiRootContainer
.
resolve
(
WikiManager
.
VERSION_FOLDER_NAME
);
versionsContainer
=
VFS
Manager
.
getOrCreate
Container
(
wikiRootContainer
,
WikiManager
.
VERSION_FOLDER_NAME
);
pageContainer
=
(
VFSContainer
)
wikiRootContainer
.
resolve
(
WikiManager
.
WIKI_RESOURCE_FOLDER_NAME
);
pageContainer
=
VFS
Manager
.
getOrCreate
Container
(
wikiRootContainer
,
WikiManager
.
WIKI_RESOURCE_FOLDER_NAME
);
mediaContainer
=
(
VFSContainer
)
wikiRootContainer
.
resolve
(
WikiContainer
.
MEDIA_FOLDER_NAME
);
mediaContainer
=
VFS
Manager
.
getOrCreate
Container
(
wikiRootContainer
,
WikiContainer
.
MEDIA_FOLDER_NAME
);
}
}
/**
/**
...
...
This diff is collapsed.
Click to expand it.
src/main/java/org/olat/modules/wiki/WikiManager.java
+
2
−
0
View file @
26e4239f
...
@@ -208,6 +208,8 @@ public class WikiManager {
...
@@ -208,6 +208,8 @@ public class WikiManager {
Files
.
createDirectories
(
wikiDir
);
Files
.
createDirectories
(
wikiDir
);
mediaDir
=
destDir
.
resolve
(
WikiContainer
.
MEDIA_FOLDER_NAME
);
mediaDir
=
destDir
.
resolve
(
WikiContainer
.
MEDIA_FOLDER_NAME
);
Files
.
createDirectories
(
mediaDir
);
Files
.
createDirectories
(
mediaDir
);
Path
versionDir
=
destDir
.
resolve
(
VERSION_FOLDER_NAME
);
Files
.
createDirectories
(
versionDir
);
}
}
@Override
@Override
...
...
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