Commit d5e0f210 authored by Elias Villiger's avatar Elias Villiger
Browse files

Some minor improvements to the excel import - refs #4922

parent 8203e8f7
Pipeline #960 passed with stage
in 1 minute and 40 seconds
......@@ -3523,7 +3523,7 @@ See also `downloadButton`_ to offer a download of an uploaded file.
* *importToTable*: <mariadb.tablename> - **Required**. Providing this parameter activates the import. If the table
doesn't exist, it will be created.
* *importToColumn*: <col1>,<col2>,... - If none provided, the Excel column names A, B, ... are used. Note: These
* *importToColumns*: <col1>,<col2>,... - If none provided, the Excel column names A, B, ... are used. Note: These
have to match the table's column names if the table already exists.
* *importRegion*: [tab],[startColumn],[startRow],[endColumn],[endRow]|... - All parts are optional (default:
entire 1st sheet). Tab can either be given as an index (1-based) or a name. start/endColumn can be given either
......
......@@ -378,6 +378,8 @@ class Save {
$newValues[COLUMN_MIME_TYPE] = $vars[VAR_FILE_MIME_TYPE];
}
}
} elseif (isset($formElement[FE_IMPORT_TO_TABLE]) && !isset($formElement[FE_SLAVE_ID])) {
// Excel import on nonexisting column -> no upload
} else {
// 'Advanced Upload'
$this->doUploadSlave($formElement, $modeUpload);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment