diff --git a/front/php/templates/language/ca_ca.json b/front/php/templates/language/ca_ca.json old mode 100644 new mode 100755 diff --git a/front/php/templates/language/de_de.json b/front/php/templates/language/de_de.json old mode 100644 new mode 100755 diff --git a/front/php/templates/language/es_es.json b/front/php/templates/language/es_es.json old mode 100644 new mode 100755 diff --git a/front/php/templates/language/fr_fr.json b/front/php/templates/language/fr_fr.json old mode 100644 new mode 100755 diff --git a/front/php/templates/language/it_it.json b/front/php/templates/language/it_it.json old mode 100644 new mode 100755 diff --git a/front/php/templates/language/nb_no.json b/front/php/templates/language/nb_no.json old mode 100644 new mode 100755 diff --git a/front/php/templates/language/pl_pl.json b/front/php/templates/language/pl_pl.json old mode 100644 new mode 100755 diff --git a/front/php/templates/language/pt_br.json b/front/php/templates/language/pt_br.json old mode 100644 new mode 100755 diff --git a/front/php/templates/language/ru_ru.json b/front/php/templates/language/ru_ru.json old mode 100644 new mode 100755 diff --git a/front/php/templates/language/zh_cn.json b/front/php/templates/language/zh_cn.json old mode 100644 new mode 100755 diff --git a/front/plugins/sync/sync.py b/front/plugins/sync/sync.py index af257c2b..b99093ee 100755 --- a/front/plugins/sync/sync.py +++ b/front/plugins/sync/sync.py @@ -236,8 +236,9 @@ def main(): # Prepare the insert statement if new_devices: - columns = ', '.join(k for k in new_devices[0].keys() if k != 'rowid') - placeholders = ', '.join('?' for k in new_devices[0] if k != 'rowid') + # creating insert statement, removing 'rowid', 'devStatus' as handled on the target and devStatus is resolved on the fly + columns = ', '.join(k for k in new_devices[0].keys() if k not in ['rowid', 'devStatus']) + placeholders = ', '.join('?' for k in new_devices[0] if k not in ['rowid', 'devStatus']) sql = f'INSERT INTO Devices ({columns}) VALUES ({placeholders})' # Extract values for the new devices @@ -254,8 +255,6 @@ def main(): mylog('verbose', [message]) write_notification(message, 'info', timeNowTZ()) - - # Commit and close the connection conn.commit()