Change variable name for clarity (CFM-219)

COmanage · Mar 23, 2023 · ffa6760 · ffa6760
1 parent e88f7c9
commit ffa6760
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/app/src/View/Helper/FieldHelper.php b/app/src/View/Helper/FieldHelper.php
@@ -109,7 +109,7 @@ public function control(string $fieldName,
     $fieldSupplement = !empty($config['supplement']) ? $config['supplement'] : [];
 
     // For special fields that should not include <label> markup, allow fields to make the label text only
-    $textOnlyLabel = !empty($config['textOnlyLabel']) ? $config['textOnlyLabel'] : false;
+    $labelIsTextOnly = !empty($config['labelIsTextOnly']) ? $config['labelIsTextOnly'] : false;
 
     // Remove prefix from field value
     if(isset($config['prefix'], $this->getView()->get('vv_obj')->$fieldName)) {
@@ -170,7 +170,7 @@ public function control(string $fieldName,
     }
 
     return $this->startLine($liClass)
-           . $this->formNameDiv($fieldName, $labelText, $fieldType, $textOnlyLabel)
+           . $this->formNameDiv($fieldName, $labelText, $fieldType, $labelIsTextOnly)
            . ( !empty($config['prefix']) ?
                  $this->formInfoWithPrefixDiv($controlCode, $config['prefix'], $fieldSupplement) :
                  $this->formInfoDiv($controlCode, $fieldSupplement) )
@@ -344,11 +344,11 @@ protected function formInfoWithPrefixDiv(string $context, string $prefix, array
    * @param  string  $fieldName Form field
    * @param  string  $labelText Label text (fieldName language key used by default)
    * @param  string  $fieldType Type of field (string, boolean, timestamp, etc)
-   * @param  boolean $textOnlyLabel True if label should be text only. Otherwise false.
+   * @param  boolean $labelIsTextOnly True if label should be text only. Otherwise false.
    * @return string             Form Name HTML
    */
 
-  protected function formNameDiv(string $fieldName, string $labelText=null, string $fieldType, bool $textOnlyLabel=false): string {
+  protected function formNameDiv(string $fieldName, string $labelText=null, string $fieldType, bool $labelIsTextOnly=false): string {
     $label = $labelText;
     $desc = null;
 
@@ -408,7 +408,7 @@ protected function formNameDiv(string $fieldName, string $labelText=null, string
 
     return '<div class="field-name">
       <div class="field-title">'
-      . ($this->editable && !($textOnlyLabel) && ($fieldType != 'boolean')
+      . ($this->editable && !($labelIsTextOnly) && ($fieldType != 'boolean')
          ? $this->Form->label($fn, $label)
          : $label) 
       . ($this->editable
@@ -463,10 +463,10 @@ public function statusControl(string $fieldName,
     }
 
     // For special fields that should not include <label> markup, allow fields to make the label text only
-    $textOnlyLabel = !empty($config['textOnlyLabel']) ? $config['textOnlyLabel'] : false;
+    $labelIsTextOnly = !empty($config['labelIsTextOnly']) ? $config['labelIsTextOnly'] : false;
 
     return $this->startLine()
-           . $this->formNameDiv($fieldName, $labelText, 'string', $textOnlyLabel)
+           . $this->formNameDiv($fieldName, $labelText, 'string', $labelIsTextOnly)
            . $linkHtml
            . $this->endLine();
   }

diff --git a/app/templates/ApiUsers/fields.inc b/app/templates/ApiUsers/fields.inc
@@ -50,7 +50,7 @@ if($vv_action == 'add' || $vv_action == 'edit') {
      'confirm' => __d('operation', 'api.key.generate.confirm')
     ];
 
-    $config = ['textOnlyLabel' => true];
+    $config = ['labelIsTextOnly' => true];
   }
 
   print $this->Field->statusControl('api_key',