Fix contact import and extension import button
This commit is contained in:
parent
bcf7cbaad2
commit
fcda82136f
|
|
@ -112,8 +112,8 @@
|
||||||
$schema[$i]['table'] = $table_name;
|
$schema[$i]['table'] = $table_name;
|
||||||
$schema[$i]['parent'] = $parent_name;
|
$schema[$i]['parent'] = $parent_name;
|
||||||
foreach ($table['fields'] as $row) {
|
foreach ($table['fields'] as $row) {
|
||||||
if (!empty($row['deprecated']) && $row['deprecated'] !== 'true') {
|
if (empty($row['deprecated']) || !empty($row['deprecated']) && $row['deprecated'] !== 'true') {
|
||||||
if (!empty($row['name'])) {
|
if (!empty($row['name']['text'])) {
|
||||||
$field_name = $row['name']['text'];
|
$field_name = $row['name']['text'];
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
@ -274,7 +274,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
//user selected fields, labels
|
//user selected fields, labels
|
||||||
$fields = $_POST['fields'];
|
$fields = $_POST['fields'] ?? [];
|
||||||
$labels = $_POST['labels'] ?? [];
|
$labels = $_POST['labels'] ?? [];
|
||||||
|
|
||||||
//set the domain_uuid
|
//set the domain_uuid
|
||||||
|
|
|
||||||
|
|
@ -171,7 +171,7 @@
|
||||||
echo "<div class='action_bar' id='action_bar'>\n";
|
echo "<div class='action_bar' id='action_bar'>\n";
|
||||||
echo " <div class='heading'><b>".$text['header-extensions']." (".$num_rows.")</b></div>\n";
|
echo " <div class='heading'><b>".$text['header-extensions']." (".$num_rows.")</b></div>\n";
|
||||||
echo " <div class='actions'>\n";
|
echo " <div class='actions'>\n";
|
||||||
if (permission_exists('extension_import') && (!isset($_SESSION['limit']['extensions']['numeric']) || $total_extensions < $_SESSION['limit']['extensions']['numeric'])) {
|
if (permission_exists('extension_import') || (!isset($_SESSION['limit']['extensions']['numeric']) || $total_extensions < $_SESSION['limit']['extensions']['numeric'])) {
|
||||||
echo button::create(['type'=>'button','label'=>$text['button-import'],'icon'=>$_SESSION['theme']['button_icon_import'],'link'=>'extension_imports.php']);
|
echo button::create(['type'=>'button','label'=>$text['button-import'],'icon'=>$_SESSION['theme']['button_icon_import'],'link'=>'extension_imports.php']);
|
||||||
}
|
}
|
||||||
if (permission_exists('extension_export')) {
|
if (permission_exists('extension_export')) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue