|
|
You see the message, because no virtual services exist in the database. The matter is, "RS pool" tab should be just hidden in such a case. That is the only real bug here. |
|
|
|
Yes, your are right and it's not high priority. |
|
|
|
I'm leaving this "acknowledged" to be fixed later. |
|
|
|
0001-The-new-SLB-item-form-now-gives-a-notice-when-one-of.patch (3,577 bytes)
From ead76d0fefe02d86910a0a59754d03faa3a8e3ab Mon Sep 17 00:00:00 2001
From: Hannes Georg <hannes.georg@xing.com>
Date: Mon, 12 Mar 2012 09:41:30 +0100
Subject: [PATCH] The new SLB item form now gives a notice when one of the
realms is emtpy
---
wwwroot/inc/slb-interface.php | 44 +++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/wwwroot/inc/slb-interface.php b/wwwroot/inc/slb-interface.php
index 988917f..3bf2e25 100644
--- a/wwwroot/inc/slb-interface.php
+++ b/wwwroot/inc/slb-interface.php
@@ -63,34 +63,58 @@ function renderSLBEditTab ($entity_id)
// realms 1 and 2 are realms to draw inputs for
function renderNewSLBItemForm ($realm1, $realm2)
{
- function print_realm_select_input($realm)
+ /**
+ * Returns a list of values, a human readable name and options
+ * for the selecttag for a given realm.
+ */
+ function get_realm_data($realm)
{
+ $name = null;
+ $list = array();
+ $options = array();
switch ($realm)
{
case 'object':
- echo "<tr valign=top><th class=tdright>Load balancer</th><td class=tdleft>";
- printSelect (getNarrowObjectList ('IPV4LB_LISTSRC'), array ('name' => 'object_id', 'tabindex' => 100));
+ $name = 'Load balancer';
+ $list = getNarrowObjectList ('IPV4LB_LISTSRC');
+ $options = array ('name' => 'object_id', 'tabindex' => 100);
break;
case 'ipv4vs':
- echo '</td></tr><tr><th class=tdright>Virtual service</th><td class=tdleft>';
- printSelect (getIPv4VSOptions(), array ('name' => 'vs_id', 'tabindex' => 101));
+ $name = 'Virtual service';
+ $list = getIPv4VSOptions();
+ $options = array ('name' => 'vs_id', 'tabindex' => 101);
break;
case 'ipv4rspool':
- echo '</td></tr><tr><th class=tdright>RS pool</th><td class=tdleft>';
- printSelect (getIPv4RSPoolOptions(), array ('name' => 'pool_id', 'tabindex' => 102));
+ $name = 'RS pool';
+ $list = getIPv4RSPoolOptions();
+ $options = array ('name' => 'pool_id', 'tabindex' => 102);
break;
default:
throw new InvalidArgException('realm', $realm);
}
+ return array('name'=>$name, 'list'=>$list, 'options'=> $options);
}
+ $realm1_data = get_realm_data($realm1);
+ $realm2_data = get_realm_data($realm2);
startPortlet ('Add new');
echo "<table cellspacing=0 cellpadding=5 align=center>";
printOpFormIntro ('addLB');
- print_realm_select_input($realm1);
+ echo "<tr valign=top><th class=tdright>{$realm1_data['name']}</th><td class=tdleft>";
+ printSelect ($realm1_data['list'], $realm1_data['options']);
echo '</td><td class=tdcenter valign=middle rowspan=2>';
- printImageHREF ('ADD', 'Configure LB', TRUE, 120);
- print_realm_select_input($realm2);
+ if( $realm1_data['list'] && $realm1_data['list'] ){
+ printImageHREF ('ADD', 'Configure LB', TRUE, 120);
+ }else{
+ $names = array();
+ if( !$realm1_data['list'] ) $names[]= 'a '.$realm1_data['name'];
+ if( !$realm2_data['list'] ) $names[]= 'a '.$realm2_data['name'];
+ $message = 'Please create '.(join(' and ', $names)).'.';
+ showNotice($message);
+ printImageHREF ('DENIED', $message, FALSE);
+ }
+ echo "<tr valign=top><th class=tdright>{$realm2_data['name']}</th><td class=tdleft>";
+ printSelect ($realm2_data['list'], $realm2_data['options']);
echo "</td></tr>\n";
echo "<tr><th class=tdright>VS config</th><td colspan=2><textarea tabindex=110 name=vsconfig rows=10 cols=80></textarea></td></tr>";
echo "<tr><th class=tdright>RS config</th><td colspan=2><textarea tabindex=111 name=rsconfig rows=10 cols=80></textarea></td></tr>";
--
1.7.5.4
|
|
|
|
Hi,
I created a patch which shows a notice if any of the selects is empty. |
|
|
|
I have studied the patch, it implements something different. Hannes, could you check the contents of triggers.php and prepare a different patch, which would disable respective tab, unless all the data it relies upon is present? |
|
|
|
After thoroughly reviewing the suggested patch and my own comment I resolve this issue with the following notes:
1. Addressing this issue through the tab trigger would indeed be more expensive than it looked initially due to building the SELECT OPTIONs.
2. The suggested patch is now merged into master branch (commit 2bb66f5) with a few justifications:
2.1. The check condition had $realm1_data checked twice.
2.2. Suppressing the submit control isn't enough, the <FORM> tag should be suppressed as well (otherwise the form is still submittable with Enter).
2.3. The current coding convention is using count() and implode() instead of array itself and join() respectively, as well as certain spacing/indentation/parentheses pattern.
3. This fix won't be backported to maintenance-0.19.x branch.
Thank you. |
|
