From 9d1b6ea35cb44dc3428fa0a534f67d19e16cc522 Mon Sep 17 00:00:00 2001 From: jerome mouneyrac Date: Tue, 16 Nov 2010 07:45:31 +0000 Subject: [PATCH] webservice MDL-25195 fix web service admin pages navigation bar/navigation --- admin/webservice/service.php | 3 ++- admin/webservice/service_functions.php | 12 +++++------- admin/webservice/service_user_settings.php | 20 ++++++++++---------- admin/webservice/service_users.php | 18 +++++++++--------- admin/webservice/testclient.php | 4 +--- webservice/amf/testclient/index.php | 9 +++++++++ 6 files changed, 36 insertions(+), 30 deletions(-) diff --git a/admin/webservice/service.php b/admin/webservice/service.php index 07898380e6a..f8761d35f81 100644 --- a/admin/webservice/service.php +++ b/admin/webservice/service.php @@ -29,13 +29,14 @@ require_once($CFG->dirroot . '/webservice/lib.php'); admin_externalpage_setup('externalservice'); -//Deactivate the 'Edit service' navigation node, and use the main 'Service' navigation node +//define nav bar $node = $PAGE->settingsnav->find('externalservice', navigation_node::TYPE_SETTING); $newnode = $PAGE->settingsnav->find('externalservices', navigation_node::TYPE_SETTING); if ($node && $newnode) { $node->display = false; $newnode->make_active(); } +$PAGE->navbar->add(get_string('externalservice', 'webservice')); //Retrieve few general parameters $id = required_param('id', PARAM_INT); diff --git a/admin/webservice/service_functions.php b/admin/webservice/service_functions.php index 231067b6a50..d4f7da8ac16 100644 --- a/admin/webservice/service_functions.php +++ b/admin/webservice/service_functions.php @@ -37,14 +37,12 @@ admin_externalpage_setup('externalservicefunctions'); //define nav bar $PAGE->set_url('/' . $CFG->admin . '/websevice/service_functions.php', array('id' => $serviceid)); -$PAGE->navbar->ignore_active(true); -$PAGE->navbar->add(get_string('administrationsite')); -$PAGE->navbar->add(get_string('plugins', 'admin')); -$PAGE->navbar->add(get_string('webservices', 'webservice')); -$PAGE->navbar->add(get_string('externalservices', 'webservice'), - new moodle_url('/' . $CFG->admin . '/settings.php?section=externalservices')); +$node = $PAGE->settingsnav->find('externalservices', navigation_node::TYPE_SETTING); +if ($node) { + $node->make_active(); +} $PAGE->navbar->add(get_string('functions', 'webservice'), - new moodle_url('/' . $CFG->admin . '/webservice/service_functions.php?id=' . $serviceid)); + new moodle_url('/' . $CFG->admin . '/webservice/service_functions.php', array('id' => $serviceid))); $service = $DB->get_record('external_services', array('id' => $serviceid), '*', MUST_EXIST); $webservicemanager = new webservice(); diff --git a/admin/webservice/service_user_settings.php b/admin/webservice/service_user_settings.php index e8630ad94a0..40b165e4589 100644 --- a/admin/webservice/service_user_settings.php +++ b/admin/webservice/service_user_settings.php @@ -30,19 +30,19 @@ require_once($CFG->dirroot . '/' . $CFG->admin . '/webservice/forms.php'); $serviceid = required_param('serviceid', PARAM_INT); $userid = required_param('userid', PARAM_INT); -$PAGE->set_url('/' . $CFG->admin . '/webservice/service_user_settings.php', array('id' => $serviceid, 'userid' => $userid)); -$PAGE->navbar->ignore_active(true); -$PAGE->navbar->add(get_string('administrationsite')); -$PAGE->navbar->add(get_string('plugins', 'admin')); -$PAGE->navbar->add(get_string('webservices', 'webservice')); -$PAGE->navbar->add(get_string('externalservices', 'webservice'), - new moodle_url('/' . $CFG->admin . '/settings.php?section=externalservices')); -$PAGE->navbar->add(get_string('serviceusers', 'webservice'), +admin_externalpage_setup('externalserviceusersettings'); + +//define nav bar +$PAGE->set_url('/' . $CFG->admin . '/webservice/service_user_settings.php', + array('id' => $serviceid, 'userid' => $userid)); +$node = $PAGE->settingsnav->find('externalservices', navigation_node::TYPE_SETTING); +if ($node) { + $node->make_active(); +} +$PAGE->navbar->add(get_string('serviceusers', 'webservice'), new moodle_url('/' . $CFG->admin . '/webservice/service_users.php', array('id' => $serviceid))); $PAGE->navbar->add(get_string('serviceusersettings', 'webservice')); -admin_externalpage_setup('externalserviceusersettings'); - $formaction = new moodle_url('', array('id' => $serviceid, 'userid' => $userid)); $returnurl = new moodle_url('/' . $CFG->admin . '/webservice/service_users.php', array('id' => $serviceid)); diff --git a/admin/webservice/service_users.php b/admin/webservice/service_users.php index 33f098c2e4c..9d622189034 100644 --- a/admin/webservice/service_users.php +++ b/admin/webservice/service_users.php @@ -29,17 +29,17 @@ require_once($CFG->dirroot . '/webservice/lib.php'); $id = required_param('id', PARAM_INT); -$PAGE->set_url('/' . $CFG->admin . '/webservice/service_users.php', array('id' => $id)); -$PAGE->navbar->ignore_active(true); -$PAGE->navbar->add(get_string('administrationsite')); -$PAGE->navbar->add(get_string('plugins', 'admin')); -$PAGE->navbar->add(get_string('webservices', 'webservice')); -$PAGE->navbar->add(get_string('externalservices', 'webservice'), - new moodle_url('/' . $CFG->admin . '/settings.php?section=externalservices')); -$PAGE->navbar->add(get_string('serviceusers', 'webservice')); - admin_externalpage_setup('externalserviceusers'); +//define nav bar +$PAGE->set_url('/' . $CFG->admin . '/webservice/service_users.php', array('id' => $id)); +$node = $PAGE->settingsnav->find('externalservices', navigation_node::TYPE_SETTING); +if ($node) { + $node->make_active(); +} +$PAGE->navbar->add(get_string('serviceusers', 'webservice'), + new moodle_url('/' . $CFG->admin . '/webservice/service_users.php', array('id' => $id))); + $webservicemanager = new webservice(); /// Get the user_selector we will need. diff --git a/admin/webservice/testclient.php b/admin/webservice/testclient.php index dd739880802..3888b01ff07 100644 --- a/admin/webservice/testclient.php +++ b/admin/webservice/testclient.php @@ -43,9 +43,7 @@ if (!empty($function)) { $PAGE->navbar->add($function); } -//require_login(); -//require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM)); -admin_externalpage_setup('externalservice'); +admin_externalpage_setup('testclient'); // list of all available functions for testing $allfunctions = $DB->get_records('external_functions', array(), 'name ASC'); diff --git a/webservice/amf/testclient/index.php b/webservice/amf/testclient/index.php index 1613ac5f7de..4d55557a6dc 100644 --- a/webservice/amf/testclient/index.php +++ b/webservice/amf/testclient/index.php @@ -1,7 +1,16 @@ libdir . '/adminlib.php'); +admin_externalpage_setup('externalservice'); + +//page nav bar $PAGE->set_url('/webservice/amf/testclient/index.php'); +$node = $PAGE->settingsnav->find('testclient', navigation_node::TYPE_SETTING); +if ($node) { + $node->make_active(); +} +$PAGE->navbar->add(get_string('amftestclient', 'webservice')); $flashvars = new stdClass(); $flashvars->rooturl =$CFG->wwwroot;