Commit 4044adbd authored by Gold's avatar Gold Committed by Robert Lyon
Browse files

Bug 1913386 Don't display page description on page itself

Removed the Page description from the view template.

Removed where that was being set in Smarty too.

Updated tests that checked for Description text and asserted that it
*should not* be seen.

Also updated some behat secenario background definitions for
readability.

Change-Id: I56221931dd648733b054b6fbbefcc4c9da4c0b8c
parent b6fae32d
......@@ -117,6 +117,7 @@ class BehatDataGenerators extends BehatBase {
'ownername' => 'text',
'layout' => 'text',
'tags' => 'text',
'instructions' => 'text',
),
'required' => array('title', 'ownertype', 'ownername')
),
......
......@@ -2,11 +2,6 @@
{include file='modal-details.tpl'}
<input type="hidden" id="viewid" name="id" value="{$viewid}">
{if $viewdescription}
<div id="view-description" class="view-description {if $toolbarhtml}with-toolbar{/if}">
{$viewdescription|clean_html|safe}
</div>
{/if}
{if $viewinstructions}
<div id="viewinstructions" class="pageinstructions view-instructions last form-group collapsible-group small-group {if $toolbarhtml}with-toolbar{/if}">
<fieldset class="pieform-fieldset collapsible collapsible-small">
......
......@@ -670,7 +670,6 @@ if ($showmnetlink) {
}
}
$smarty->assign('viewdescription', $view->get('description'), $view->get('id'));
$smarty->assign('viewinstructions', ArtefactTypeFolder::append_view_url($view->get('instructions'), $view->get('id')));
$smarty->assign('newlayout', $newlayout);
if ($newlayout) {
......
......@@ -51,7 +51,7 @@ Scenario: Set the custom landing page
# Now see if we land on user page
Given I log in as "UserA" with password "Kupuh1pa!"
Then I should see "This is the landing page"
Then I should not see "This is the landing page"
And I log out
Given I log in as "admin" with password "Kupuh1pa!"
......
......@@ -10,11 +10,11 @@ Background:
| UserA | Kupuh1pa! | UserA@example.org | Angela | User | mahara | internal | member |
Given the following "pages" exist:
| title | description | ownertype | ownername |
| Page UserA_01 | Page 01 | user | UserA |
| Page UserA_02 | Page 02 | user | UserA |
| Page UserA_03 | Page 03 | user | UserA |
| Page UserA_04 | Page 04 | user | UserA |
| title | description | ownertype | ownername | instructions |
| Page UserA_01 | Page 01 description | user | UserA | The instructions for page 1 |
| Page UserA_02 | Page 02 description | user | UserA | The instructions for page 2 |
| Page UserA_03 | Page 03 description | user | UserA | The instructions for page 3 |
| Page UserA_04 | Page 04 description | user | UserA | The instructions for page 4 |
And the following "collections" exist:
| title | description | ownertype | ownername | pages |
......@@ -42,5 +42,6 @@ Scenario:
When I expand "Nav for collection B" node
# test link works
And I follow "Page UserA_04"
And I should see "Page 04"
And I expand "Instructions" node
Then I should see "Instructions for page 4"
And I should see "You are on page 2/2"
......@@ -6,8 +6,8 @@ Feature: Creating a page with stuff in it
Background:
Given the following "users" exist:
| username | password | email | firstname | lastname | institution | authname | role |
| UserA | Kupuh1pa! | UserA@example.org | Angela | User | mahara | internal | member |
| username | password | email | firstname | lastname | institution | authname | role |
| UserA | Kupuh1pa! | UserA@example.org | Angela | User | mahara | internal | member |
Scenario: Creating a page with content in it (Bug 1426983)
# Log in as "Admin" user
......@@ -73,7 +73,7 @@ Scenario: Creating a page with content in it (Bug 1426983)
And I should see the date "today" in the "Last updated" "Views" property with the format "d F Y"
# Verifying the page title and description changed
Then I should see "This is the edited page title"
And I should see "This is the edited description"
And I should not see "This is the edited description"
# Create a timeline version
And I press "More options"
And I follow "Save to timeline"
......@@ -103,7 +103,7 @@ Scenario: Creating a page with content in it (Bug 1426983)
| Page title | This is my page now |
And I press "Save"
And I follow "Display page"
And I should see "This is the edited description"
And I should not see "This is the edited description"
And I log out
# check page can be deleted (Bug 1755682)
......
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