MDL-53473 tool_lp: User evidence default return URL is the evidence

This commit is contained in:
Frederic Massart
2016-04-18 10:58:58 +08:00
parent f864aa4c4a
commit 8ae09bb09e
4 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -202,7 +202,7 @@ class page_helper {
}
$returnurl = $plansurl;
if ($returntype == 'plan' && $planurl) {
if ($returntype != 'plans' && $planurl) {
$returnurl = $planurl;
}
+1 -1
View File
@@ -27,7 +27,7 @@ require_once($CFG->libdir.'/adminlib.php');
$userid = optional_param('userid', false, PARAM_INT);
$id = optional_param('id', false, PARAM_INT);
$returntype = optional_param('return', 'plans', PARAM_ALPHA);
$returntype = optional_param('return', null, PARAM_ALPHA);
require_login(0, false);
\tool_lp\api::require_enabled();
+1 -1
View File
@@ -21,7 +21,7 @@
<h2>
{{plan.name}}
{{#plan.canbeedited}}
<a href="{{pluginbaseurl}}/editplan.php?id={{plan.id}}&amp;userid={{plan.userid}}&amp;return=plan">{{#pix}}t/edit, core, {{#str}}editplan, tool_lp{{/str}}{{/pix}}</a>
<a href="{{pluginbaseurl}}/editplan.php?id={{plan.id}}&amp;userid={{plan.userid}}">{{#pix}}t/edit, core, {{#str}}editplan, tool_lp{{/str}}{{/pix}}</a>
{{/plan.canbeedited}}
</h2>
<div data-region="plan-summary">
+1 -1
View File
@@ -73,7 +73,7 @@
<ul class="dropdown-menu">
<li {{^canbeedited}} class="disabled" {{/canbeedited}}>
<a href="{{#canbeedited}}
{{pluginbaseurl}}/editplan.php?id={{id}}&amp;userid={{userid}}
{{pluginbaseurl}}/editplan.php?id={{id}}&amp;userid={{userid}}&amp;return=plans
{{/canbeedited}}
{{^canbeedited}}
#