Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
48ccb46b
Commit
48ccb46b
authored
Jul 16, 2015
by
Aaron Wells
Committed by
Gerrit Code Review
Jul 16, 2015
Browse files
Merge "Don't skip on setting up pages in leap2a, just because there no artefacts"
parents
a61c66ed
e7779d20
Changes
1
Hide whitespace changes
Inline
Side-by-side
htdocs/export/leap/lib.php
View file @
48ccb46b
...
@@ -312,12 +312,13 @@ class PluginExportLeap extends PluginExport {
...
@@ -312,12 +312,13 @@ class PluginExportLeap extends PluginExport {
// Some links can be determined in advance
// Some links can be determined in advance
private
function
setup_links
()
{
private
function
setup_links
()
{
if
(
empty
(
$this
->
views
)
||
empty
(
$this
->
artefacts
))
{
// If there are no pages, no links to set up.
if
(
empty
(
$this
->
views
))
{
return
;
return
;
}
}
$viewlist
=
join
(
','
,
array_keys
(
$this
->
views
));
$viewlist
=
join
(
','
,
array_keys
(
$this
->
views
));
$artefactlist
=
join
(
','
,
array_keys
(
$this
->
artefacts
));
// Views in collections
// Views in collections
if
(
$this
->
collections
)
{
if
(
$this
->
collections
)
{
...
@@ -334,6 +335,13 @@ class PluginExportLeap extends PluginExport {
...
@@ -334,6 +335,13 @@ class PluginExportLeap extends PluginExport {
}
}
}
}
// If there are no artefacts, no need to try to set those up.
if
(
empty
(
$this
->
artefacts
))
{
return
;
}
$artefactlist
=
join
(
','
,
array_keys
(
$this
->
artefacts
));
// Artefacts directly in views
// Artefacts directly in views
$records
=
get_records_select_array
(
$records
=
get_records_select_array
(
'view_artefact'
,
'view_artefact'
,
...
...
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