Skip to content
GitLab
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
c4c910d7
Commit
c4c910d7
authored
Oct 03, 2018
by
Robert Lyon
Committed by
Gerrit Code Review
Oct 03, 2018
Browse files
Merge "Bug 1795189: Handle collections better when making page via tags"
parents
62d11942
cc724200
Changes
1
Hide whitespace changes
Inline
Side-by-side
htdocs/view/editlayout.php
View file @
c4c910d7
...
...
@@ -789,6 +789,7 @@ function set_view_title_and_description(Pieform $form, $values) {
JOIN
{
view_layout_columns
}
vlc ON vlc.id = vlrc.columns
WHERE vlrc.viewlayout = ? and vlrc.row = ?"
,
array
(
$values
[
'currentlayoutselect'
],
1
));
require_once
(
'searchlib.php'
);
require_once
(
'collection.php'
);
$data
=
array
();
// Get all the items containing any of the tags
foreach
(
$createtags
as
$tag
)
{
...
...
@@ -801,6 +802,10 @@ function set_view_title_and_description(Pieform $form, $values) {
$combineddata
=
array
();
// Now check what we have so we know what to do with them
foreach
(
$data
as
$item
)
{
// If collection but tag is in one of it's views then no $item->tags so skip
if
(
!
isset
(
$item
->
tags
))
{
continue
;
}
// Check that the block has all of the tags we entered, and if not skip it
if
(
array_diff
(
$createtags
,
$item
->
tags
))
{
continue
;
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment