From 25556f1f0e576dfa976c066841418e24c7997a60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Thu, 16 Feb 2017 12:18:25 +0100
Subject: [PATCH] Moved Tree rendering in its own method in baseSelector to
reduce cyclomatic complexity
---
include/class_baseSelector.inc | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/include/class_baseSelector.inc b/include/class_baseSelector.inc
index 1d85e196f..dc4884587 100644
--- a/include/class_baseSelector.inc
+++ b/include/class_baseSelector.inc
@@ -27,8 +27,8 @@
/*!
* \brief Class Base Selector
*/
-class baseSelector {
-
+class baseSelector
+{
private $base;
protected $pid;
private $action;
@@ -183,6 +183,15 @@ class baseSelector {
return TRUE;
}
+ $this->renderTree();
+
+ $this->lastState = TRUE;
+ return TRUE;
+ }
+
+ protected function renderTree()
+ {
+ global $config;
$link = "onclick=\"\$('bs_rebase_".$this->pid."').value='".base64_encode($config->current['BASE'])."'; $('submit_tree_base_".$this->pid."').click();\"";
$this->tree = '<input class="base-selector" type="text" name="'.$this->getInputHtmlId().'"'.
' id="'.$this->getInputHtmlId().'"'.
@@ -256,9 +265,6 @@ class baseSelector {
$this->tree .= '<input type="submit" style="display:none" name="submit_tree_base_'.$this->pid.'" id="submit_tree_base_'.$this->pid.'"/>';
$this->tree .= '<input type="hidden" name="bs_rebase_'.$this->pid.'" id="bs_rebase_'.$this->pid.'"/>';
$this->tree .= '<input type="hidden" name="BPID" id="BPID" value="'.$this->pid.'"/>';
-
- $this->lastState = TRUE;
- return TRUE;
}
--
GitLab