Commit 91522a91 authored by Dianne Tennent's avatar Dianne Tennent Committed by Robert Lyon
Browse files

Bug 1949421: Group submissions page/menu item 

Combine 'Current submissions' and 'Archived submissions' into 'Submissions'

Change-Id: I7f19c163f42b76add273114a73d394a524e86a74
parent 5ce8d687

htdocs/admin/groups/archives.php

+1 −2
Original line number Diff line number Diff line
@@ -27,12 +27,11 @@ $tabs = (object) [ 
    'archivedclass' => '',

];



define('TITLE', get_string('submissions', 'admin'));

if (param_exists('current')) {

    define('TITLE', get_string('currentsubmissions', 'admin'));

    $tabs->currentclass = 'active';

}

else {

    define('TITLE', get_string('archivedsubmissions', 'admin'));

    $tabs->archivedclass = 'active';

}

htdocs/lang/en.utf8/admin.php

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ $string['makeadminsintousers'] = 'Turn selected administrator accounts back into 
$string['groupadminsupdated'] = 'Group administrators have been updated';

$string['groupquotaupdated'] = 'Group quota has been updated';

$string['addnewgroupcategory'] = 'Enter new group category';

$string['submissions'] = 'Submissions';

$string['archivedsubmissions'] = 'Archived submissions';

$string['archivedsubmissionsdesc'] = 'Administer archived submissions';

$string['currentsubmissions'] = 'Current submissions';

htdocs/lib/web.php

+4 −10
Original line number Diff line number Diff line
@@ -2429,16 +2429,10 @@ function admin_nav() { 
            'title'  => get_string('groupcategories', 'admin'),

            'weight' => 20,

        ),

        'managegroups/current' => array(

            'path'   => 'managegroups/archives',

            'url'    => 'admin/groups/archives.php?current=1',

            'title'  => get_string('currentsubmissions', 'admin'),

            'weight' => 27,

        ),

        'managegroups/archives' => array(

        'managegroups/submissions' => array(

            'path'   => 'managegroups/archives',

            'url'    => 'admin/groups/archives.php',

            'title'  => get_string('archivedsubmissions', 'admin'),

            'title'  => get_string('submissions', 'admin'),

            'weight' => 27,

        ),

        'managegroups/settings' => array(
@@ -2707,10 +2701,10 @@ function institutional_admin_nav() { 
            'weight' => 20,

            'iconclass' => 'users',

        ),

        'managegroups/archives' => array(

        'managegroups/submissions' => array(

            'path'   => 'managegroups/archives',

            'url'    => 'admin/groups/archives.php',

            'title'  => get_string('archivedsubmissions', 'admin'),

            'title'  => get_string('submissions', 'admin'),

            'weight' => 5,

        ),

        'managegroups/uploadcsv' => array(

test/behat/features/site_content/menu_navigation.feature

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ Scenario: Checking menu items are available as site admin (Bug 1467368) 
 Then I should see "Administer groups" in the "Admin Groups sub-menu" "Nav" property

 And I should see "Group categories" in the "Admin Groups sub-menu" "Nav" property

 And I should see "Default group settings" in the "Admin Groups sub-menu" "Nav" property

 And I should see "Archived submissions" in the "Admin Groups sub-menu" "Nav" property

 And I should see "Submissions" in the "Admin Groups sub-menu" "Nav" property

 And I should see "Add groups by CSV" in the "Admin Groups sub-menu" "Nav" property

 And I should see "Update group members by CSV" in the "Admin Groups sub-menu" "Nav" property

 # Checking the sub administration in Institutions
@@ -160,7 +160,7 @@ Scenario: Checking menu items are available as Institution Administrator (Bug 14 
 And I press "Show menu for Groups" in the "Administration menu" "Nav" property

 Then I should not see "Administer groups" in the "Admin Groups sub-menu" "Nav" property

 And I should not see "Group categories" in the "Admin Groups sub-menu" "Nav" property

 And I should see "Archived submissions" in the "Admin Groups sub-menu" "Nav" property

 And I should see "Submissions" in the "Admin Groups sub-menu" "Nav" property

 And I should see "Add groups by CSV" in the "Admin Groups sub-menu" "Nav" property

 And I should see "Update group members by CSV" in the "Admin Groups sub-menu" "Nav" property

 # Checking the sub navigation in Institutions