AbstractBuildForm.php, BuildFormBootstrap.php, BuildFormTable.php: Remove...

AbstractBuildForm.php, BuildFormBootstrap.php, BuildFormTable.php: Remove parameter 'table' from Delete SIP URLs. ToolTip updated.

extension/qfq/qfq/AbstractBuildForm.php

@@ -1449,17 +1449,16 @@ abstract class AbstractBuildForm {
                 $toolTip = 'Delete';
 
                 if ($this->showDebugInfo) {
-                    $toolTip .= PHP_EOL . "form = '" . $this->formSpec[F_NAME] . "'" . PHP_EOL . "table = '" . $this->formSpec[F_TABLE_NAME] . "'" . PHP_EOL . "r = '" . $row[$nameColumnId] . "'";
+                    $toolTip .= PHP_EOL . "form = '" . $this->formSpec[F_NAME] . "'" . PHP_EOL . "r = '" . $row[$nameColumnId] . "'";
                 }
 
 //                $buttonDelete = $this->buildButtonCode('delete-button', $toolTip, GLYPH_ICON_DELETE, $disabled);
 
-                $s = $this->createDeleteUrl($formElement[SUBRECORD_PARAMETER_FORM], $targetTableName, $row[$nameColumnId], RETURN_SIP);
+                $s = $this->createDeleteUrl($formElement[SUBRECORD_PARAMETER_FORM], '', $row[$nameColumnId], RETURN_SIP);
 //                $rowHtml .= Support::wrapTag('<td>', Support::wrapTag("<button type='button' class='record-delete btn btn-default' data-sip='$s'>", '<span class="glyphicon ' . GLYPH_ICON_DELETE . '"></span>'));
                 $rowHtml .= Support::wrapTag('<td>', Support::wrapTag("<button type='button' class='record-delete btn btn-default' data-sip='$s' " . Support::doAttribute('title', $toolTip) . ">", '<span class="glyphicon ' . GLYPH_ICON_DELETE . '"></span>'));
 
 
-
             }
 
             Support::setIfNotSet($row, FE_SUBRECORD_ROW_CLASS);
@@ -1753,15 +1752,19 @@ abstract class AbstractBuildForm {
      */
     public function createDeleteUrl($formName, $tableName, $recordId, $mode = RETURN_URL) {
 
-        //TODO: Umstellen auf Benutzung der Link Klasse.
-
         $queryStringArray = [
-            SIP_FORM => $formName,
-            SIP_TABLE => $tableName,
             SIP_RECORD_ID => $recordId,
             SIP_MODE_ANSWER => MODE_JSON
         ];
 
+        if ($formName !== '') {
+            $queryStringArray[SIP_FORM] = $formName;
+        }
+
+        if ($tableName !== '') {
+            $queryStringArray[SIP_TABLE] = $tableName;
+        }
+
         $queryString = Support::arrayToQueryString($queryStringArray);
 
         $sip = $this->store->getSipInstance();

extension/qfq/qfq/BuildFormBootstrap.php

@@ -170,7 +170,7 @@ class BuildFormBootstrap extends AbstractBuildForm {
             $toolTip = 'Delete';
 
             if ($this->showDebugInfo && $recordId > 0) {
-                $toolTip .= PHP_EOL . "form = '" . $this->formSpec[F_NAME] . "'" . PHP_EOL . "table = '" . $this->formSpec[F_TABLE_NAME] . "'" . PHP_EOL . "r = '" . $recordId . "'";
+                $toolTip .= PHP_EOL . "form = '" . $this->formSpec[F_NAME] . "'" . PHP_EOL . "r = '" . $recordId . "'";
             }
             $disabled = ($recordId > 0) ? '' : 'disabled';
 
@@ -345,7 +345,7 @@ class BuildFormBootstrap extends AbstractBuildForm {
         $tabId = $this->getTabId();
 
         if (0 < ($recordId = $this->store->getVar(SIP_RECORD_ID, STORE_SIP))) {
-            $deleteUrl = $this->createDeleteUrl($this->formSpec[F_NAME], $this->formSpec[F_TABLE_NAME], $recordId);
+            $deleteUrl = $this->createDeleteUrl($this->formSpec[F_NAME], '', $recordId);
         }
 
         $actionUpload = FILE_ACTION . '=' . FILE_ACTION_UPLOAD;

extension/qfq/qfq/BuildFormTable.php

@@ -77,7 +77,7 @@ class BuildFormTable extends AbstractBuildForm {
         $formEditUrl = $this->createFormEditUrl();
         $html .= "<p><a " . Support::doAttribute('href', $formEditUrl) . ">Edit</a><small>[$sipParamString]</small></p>";
 
-        $deleteUrl = $this->createDeleteUrl($this->formSpec[F_NAME], $this->formSpec[F_TABLE_NAME], $this->store->getVar(SIP_RECORD_ID, STORE_SIP));
+        $deleteUrl = $this->createDeleteUrl($this->formSpec[F_NAME], '', $this->store->getVar(SIP_RECORD_ID, STORE_SIP));
         $html .= "<p><a " . Support::doAttribute('href', $deleteUrl) . ">Delete</a>";
 
         $html .= $this->wrapItem(WRAP_SETUP_TITLE, $this->formSpec['title'], true);