Commit f6930a74 authored by Ghada El-Zoghbi's avatar Ghada El-Zoghbi Committed by Robert Lyon
Browse files

Bug 1832796: Group journals - display add link only if user has permission 

For a regular member who does not have permission to
add a journal to a group, the display message should
not include the 'Add one' link.

Sponsored by The Australian National University

behatnotneeded

Change-Id: I657f47b51b2c505cab4c2501f39e03b0252bdf72
(cherry picked from commit 9188fc20)
(cherry picked from commit c40945d8)
parent 67bf2f95

htdocs/artefact/blog/lang/en.utf8/artefact.blog.php

+2 −1
Original line number Diff line number Diff line
@@ -161,7 +161,8 @@ $string['postscopiedfromview'] = 'Entries copied from %s'; 


$string['youhavenoblogs'] = 'You have no journals.';

$string['youhavenoblogsaddone'] = 'You have no journals. <a href="%s">Add one</a>.';

$string['youhavenogroupblogs1'] = 'There are no journals in this group. <a href="%s">Add one</a>.';

$string['youhavenogroupblogs'] = 'There are no journals in this group.';

$string['youhavenogroupblogsaddone'] = 'There are no journals in this group. <a href="%s">Add one</a>.';

$string['youhavenoinstitutionblogs1'] = 'There are no journals in this institution. <a href="%s">Add one</a>.';

$string['youhavenositeblogs1'] = 'There are no site journals. <a href="%s">Add one</a>.';

$string['youhavenblog'] = array(

htdocs/theme/raw/plugintype/artefact/blog/templates/index.tpl

+5 −1
Original line number Diff line number Diff line
@@ -10,7 +10,11 @@ 
{if !$blogs->data}

  <p class="no-results">

  {if $group}

    {str tag=youhavenogroupblogs1 section=artefact.blog arg1=$grouphref}

    {if $canedit}

      {str tag=youhavenogroupblogsaddone section=artefact.blog arg1=$grouphref}

    {else}

      {str tag=youhavenogroupblogs section=artefact.blog arg1=$grouphref}

    {/if}

  {elseif $institutionname == 'mahara'}

    {str tag=youhavenositeblogs1 section=artefact.blog arg1=$sitehref}

  {elseif $institutionname}