Commit cedcd0ad authored by Aaron Wells's avatar Aaron Wells Committed by Gerrit Code Review
Browse files

Merge "Don't show a "copied from template" message when creating a new view"

parents 091285cf 7ea99fe0
......@@ -378,7 +378,6 @@ $string['choosetemplategrouppageandcollectiondescription'] = '<p>Here you can se
$string['choosetemplateinstitutionpageandcollectiondescription'] = '<p>Here you can search through the pages that this institution is allowed to copy as a starting point for making a new page. You can see a preview of each page by clicking on its name. Once you have found the page you wish to copy, click the corresponding "Copy page" button to make a copy and begin customising it. You may also choose to copy the entire collection that the page belongs to by clicking the corresponding "Copy collection" button.</p><p><strong>Note:</strong> Institutions cannot currently make copies of journals, journal entries, plans and résumé information.</p>';
$string['choosetemplatesitepageandcollectiondescription1'] = '<p>Here you can search through the pages that can be copied on the site level as a starting point for making a new page. You can see a preview of each page by clicking on its name. Once you have found the page you wish to copy, click the corresponding "Copy page" button to make a copy and begin customising it. You may also choose to copy the entire collection that the page belongs to by clicking the corresponding "Copy collection" button.</p><p><strong>Note:</strong> Currently, it is not possible to have copies of journals, journal entries, plans and résumé information in site-level pages.</p>';
$string['copiedblocksandartefactsfromtemplate'] = 'Copied %d blocks and %d artefacts from %s';
$string['copiedblocksandartefactsfromdefaultview'] = 'Copied %d blocks and %d artefacts from the page template';
$string['filescopiedfromviewtemplate'] = 'Files copied from %s';
$string['viewfilesdirname'] = 'viewfiles';
$string['viewfilesdirdesc'] = 'Files from copied pages';
......
......@@ -6435,10 +6435,6 @@ function createview_submit(Pieform $form, $values) {
$SESSION->add_error_msg(get_string('viewcreatewouldexceedquota', 'view'));
redirect(get_config('wwwroot') . 'view/index.php');
}
$SESSION->add_ok_msg(get_string('copiedblocksandartefactsfromdefaultview', 'view',
$copystatus['blocks'],
$copystatus['artefacts'])
);
}
else {
$view = View::create($values);
......
......@@ -35,7 +35,6 @@ I can create a new page from the site default portfolio page
And I should see "Pages"
And I should see "Create page"
And I press "Create page"
And I should see "Copied 1 blocks and 0 artefacts from the page template"
And I should see "Edit title and description"
And I click on "Edit content"
Then I should see "Lorem Ipsum is simply dummy text of the printing and typesetting industry."
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