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
ed39b985
Commit
ed39b985
authored
Oct 22, 2015
by
Son Nguyen
Committed by
Gerrit Code Review
Oct 22, 2015
Browse files
Merge "Show created or updated time for shared pages to a group. Bug 1490569."
parents
7edf4f90
d2a4f386
Changes
2
Hide whitespace changes
Inline
Side-by-side
htdocs/theme/raw/plugintype/blocktype/groupviews/templates/groupviewssection.tpl
View file @
ed39b985
...
...
@@ -4,6 +4,10 @@
<span
class=
"sr-only"
>
{
$view.title
}
</span>
</a>
<h5
class=
"list-group-item-heading"
>
{
$view.title
}
</h5>
<span
class=
"postedon text-small text-midtone"
>
{
if
$view.mtime
==
$view.ctime
}{
str
tag
=
Created
}{
else
}{
str
tag
=
Updated
}{/
if
}
{
$view.mtime
|
strtotime
|
format_date
}
</span>
{
if
$view.template
}
<div
class=
"grouppage-from"
>
{
$view.form
|
safe
}
...
...
test/behat/features/group/shared_pages_timestamp.feature
0 → 100644
View file @
ed39b985
@javascript
@core
@core_group
Feature
:
Show created or updated time for shared pages to a group
In order to see shared pages
As as admin
To see that they display in the most recently updated order
Background
:
Given the following "users" exist
:
|
username
|
password
|
email
|
firstname
|
lastname
|
institution
|
authname
|
role
|
|
userA
|
Tuesd@y1
|
test01@example.com
|
Test
|
B
|
mahara
|
internal
|
member
|
|
userB
|
Tuesd@y2
|
test02@example.com
|
Test
|
C
|
mahara
|
internal
|
member
|
|
userC
|
Tuesd@y3
|
test03@example.com
|
Test
|
A
|
mahara
|
internal
|
member
|
Given the following "groups" exist
:
|
name
|
owner
|
description
|
grouptype
|
open
|
invitefriends
|
editroles
|
submittableto
|
allowarchives
|
members
|
staff
|
|
testgroup
|
admin
|
This
is
group
01
|
standard
|
ON
|
ON
|
all
|
ON
|
ON
|
userA,
userB,
userC
|
|
Given the following "pages" exist
:
|
title
|
description
|
ownertype
|
ownername
|
|
test
Page
01
|
This
is
the
page
1
|
group
|
testgroup
|
|
test
Page
02
|
This
is
the
page
2
|
group
|
testgroup
|
|
test
Page
03
|
This
is
the
page
3
|
group
|
testgroup
|
Scenario
:
Displaying shared pages in most recently updated order (Bug 1490569)
Given
I log in as
"admin"
with password
"Kupuhipa1"
And
I follow
"Groups"
And
I follow
"testgroup"
And
I follow
"Edit this page"
And
I configure the block
"Group pages"
When I set the following fields to these values
:
|
Sort
shared
pages
and
collections
by
|
Most
recently
updated
|
And
I
click
on
"Save"
Then
"test Page 01"
"text"
should appear before
"test Page 02"
"text"
And
"test Page 03"
"text"
should appear after
"test Page 02"
"text"
Write
Preview
Markdown
is supported
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