Merge branch '5833-management-tab-footer-should-be-in-a-smarty-template' into '1.4-dev'

Resolve "Management tab footer should be in a smarty template"

See merge request fusiondirectory/fd!269

ihtml/themes/breezy/management/tabfooter.tpl

+{if $readOnly}
+  <p class="plugbottom">
+    <input type="submit" name="edit_cancel" value="{msgPool type=cancelButton}"/>
+  </p>
+{else}
+  <p class="plugbottom">
+    <input type="submit" name="edit_finish" value="{msgPool type=okButton}"/>
+    &nbsp;
+    {if $showApply}
+      <input type="submit" name="edit_apply" value="{msgPool type=applyButton}"/>
+      &nbsp;
+    {/if}
+    <input type="submit" name="edit_cancel" value="{msgPool type=cancelButton}"/>
+  </p>
+{/if}

include/management/class_management.inc

@@ -556,26 +556,10 @@ class management
       return '';
     }
 
-    // TODO move to smarty template
-    // In case an of locked entry, we may have opened a read-only tab.
-    $str = '';
-    if ($this->tabObject->readOnly()) {
-      $str .= '<p class="plugbottom">'."\n".
-        '<input type="submit" name="edit_cancel" value="'.msgPool::cancelButton().'">'."\n".
-        '</p>';
-    } else {
-      // Display ok, (apply) and cancel buttons
-      $str .= '<p class="plugbottom">'."\n";
-      $str .= '<input type="submit" name="edit_finish" value="'.msgPool::okButton().'"/>'."\n";
-      $str .= "&nbsp;\n";
-      if ($this->currentDn != 'new') {
-        $str .= '<input type="submit" name="edit_apply" value="'.msgPool::applyButton().'"/>'."\n";
-        $str .= "&nbsp;\n";
-      }
-      $str .= '<input type="submit" name="edit_cancel" value="'.msgPool::cancelButton().'"/>'."\n";
-      $str .= '</p>';
-    }
-    return $str;
+    $smarty = get_smarty();
+    $smarty->assign('readOnly', $this->tabObject->readOnly());
+    $smarty->assign('showApply', ($this->currentDn != 'new'));
+    return $smarty->fetch(get_template_path('tabfooter.tpl'));
   }
 
   function handleTemplateApply ($cancel = FALSE)

[bmortier]

SonarQube analysis indicates that quality gate is failed.

• Security Rating on New Code is passed: Actual value 1
• Reliability Rating on New Code is passed: Actual value 1
• Maintainability Rating on New Code is passed: Actual value 1
• Duplicated Lines on New Code (%) is failed: Actual value 10.912906610703043 > 3

SonarQube analysis reported no issues.

By Ghost User on 2018-05-09T14:35:40 (imported from GitLab)