mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 17:14:40 +03:00
Code

Databrowser fixed

Browse Source
This commit is contained in:
Arin Alexander 2017-10-27 21:11:42 +04:00
commit 00bc175666
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
limereport/databrowser/lrdatabrowser.cpp
View File

@ -702,7 +702,7 @@ void DataBrowser::on_dataTree_currentItemChanged(QTreeWidgetItem *current, QTree
Q_UNUSED(previous) Q_UNUSED(previous)
if (current&&(current->type() == DataBrowserTree::Connection)) { if (current&&(current->type() == DataBrowserTree::Connection)) {
bool internalConnection = m_report->dataManager()->connectionByName(ConnectionDesc::connectionNameForReport(current->text(0))); bool internalConnection = m_report->dataManager()->connectionByName(ConnectionDesc::connectionNameForReport(current->text(0)));
if (m_report->dataManager()->isConnectionConnected(current->text(0))){ if (m_report->dataManager()->isConnectionConnected(ConnectionDesc::connectionNameForReport(current->text(0)))){
ui->pbConnect->setIcon(QIcon(":/databrowser/images/plug-connect.png")); ui->pbConnect->setIcon(QIcon(":/databrowser/images/plug-connect.png"));
} else { } else {
ui->pbConnect->setIcon(QIcon(":/databrowser/images/plug-disconnect.png")); ui->pbConnect->setIcon(QIcon(":/databrowser/images/plug-disconnect.png"));

9
limereport/lrdatasourcemanager.cpp
View File

@ -650,15 +650,18 @@ void DataSourceManager::removeConnection(const QString &connectionName)
{ {
QList<ConnectionDesc*>::iterator cit = m_connections.begin(); QList<ConnectionDesc*>::iterator cit = m_connections.begin();
while( cit != m_connections.end() ){ while( cit != m_connections.end() ){
if ( ((*cit)->name().compare(connectionName) == 0) && (*cit)->isInternal() ){ if ( ((*cit)->name().compare(connectionName) == 0) ){
if ((*cit)->isInternal())
{ {
QSqlDatabase db = QSqlDatabase::database(connectionName); QSqlDatabase db = QSqlDatabase::database(connectionName);
db.close(); db.close();
} }
QSqlDatabase::removeDatabase(connectionName); QSqlDatabase::removeDatabase(connectionName);
delete (*cit);
cit = m_connections.erase(cit);
} else {
cit++;
} }
delete (*cit);
cit = m_connections.erase(cit);
} }
emit datasourcesChanged(); emit datasourcesChanged();
} }