Commit 8df4773f authored by Robert Lyon's avatar Robert Lyon
Browse files

Bug 1468156: Inbox blocktype needs to check module now



Since we moved multirecipientnotifications from artefact to module we
should now check there for it :)

Change-Id: If224ca1f323cd39d619b56a7cd1a1373afdaa04d
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent de4e9ec3
......@@ -60,10 +60,9 @@ class PluginBlocktypeInbox extends SystemBlocktype {
$maxitems = isset($configdata['maxitems']) ? $configdata['maxitems'] : 5;
// check if multirecipientnotification plugin is active or if we proceed here
if (record_exists('artefact_installed', 'name', 'multirecipientnotification', 'active', '1') && safe_require_plugin('artefact', 'multirecipientnotification')) {
if (record_exists('module_installed', 'name', 'multirecipientnotification', 'active', '1') && safe_require_plugin('module', 'multirecipientnotification')) {
global $USER;
$userid = $USER->get('id');
safe_require('artefact', 'multirecipientnotification');
$activitylist = activityblocklistin(join(',', $desiredtypes), $maxitems);
$records = $activitylist->records;
$showmore = ($activitylist->count > $maxitems);
......
......@@ -27,7 +27,7 @@
<p>{$i->message|safe}</p>
{if $i->url}
<a href="{$WWWROOT}{$i->url}" class="btn btn-default btn-xs pull-right">
{str tag="more..."} <span class="icon icon-arrow-right mls icon-sm"></span>
{if $i->urltext}{$i->urltext}{else}{str tag="more..."}{/if} <span class="icon icon-arrow-right mls icon-sm"></span>
</a>
{/if}
</div>
......
......@@ -9,7 +9,7 @@ Given the following "users" exist:
| username | password | email | firstname | lastname | institution | authname | role |
| userA | Password1 | test01@example.com | Pete | Mc | mahara | internal | member |
Scenario: Clicking on the Inbox link on the dashboard page (Bug 1427019)
Scenario: Clicking on the Inbox link on the right menu (Bug 1427019)
# Log in as users
Given I log in as "userA" with password "Password1"
# Navigating to the Inbox to check the new ID tag works
......
......@@ -44,6 +44,8 @@ Scenario: Sending messages between user and admin (Bug 1426983)
# Log in as user 1
Then I log in as "Bob" with password "Password1"
# Confirming all messages has been received
And I am on homepage
And I should see "Hi there"
And I follow "mail"
And I should see "Hi there"
And I should see "Hi there2"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment