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

Finish 1.4.88

Browse Source
This commit is contained in:
Arin Alexander 2018-07-12 21:10:36 +03:00
commit 855e2196d0
4 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -105,7 +105,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 4 LIMEREPORT_VERSION_MINOR = 4
LIMEREPORT_VERSION_RELEASE = 87 LIMEREPORT_VERSION_RELEASE = 88
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"

13
limereport/databrowser/lrsqleditdialog.cpp
View File

@ -113,8 +113,8 @@ void SQLEditDialog::accept()
if (ui->fieldsMap->rowCount()>0){ if (ui->fieldsMap->rowCount()>0){
for(int i=0;i<ui->fieldsMap->rowCount();++i){ for(int i=0;i<ui->fieldsMap->rowCount();++i){
LimeReport::FieldsCorrelation fieldsCorrelation; LimeReport::FieldsCorrelation fieldsCorrelation;
fieldsCorrelation.master=ui->fieldsMap->item(i,0)->data(Qt::DisplayRole).toString(); fieldsCorrelation.master = ui->fieldsMap->item(i,0) ? ui->fieldsMap->item(i,0)->data(Qt::DisplayRole).toString() : "";
fieldsCorrelation.detail=ui->fieldsMap->item(i,1)->data(Qt::DisplayRole).toString(); fieldsCorrelation.detail = ui->fieldsMap->item(i,1) ? ui->fieldsMap->item(i,1)->data(Qt::DisplayRole).toString() : "";
result.fieldMap.append(fieldsCorrelation); result.fieldMap.append(fieldsCorrelation);
} }
} }
@ -350,4 +350,13 @@ void SQLEditDialog::hidePreview()
ui->pbHidePreview->setVisible(false); ui->pbHidePreview->setVisible(false);
} }
void SQLEditDialog::on_pbDelField_clicked()
{
ui->fieldsMap->removeRow(ui->fieldsMap->currentRow());
}
} // namespace LimeReport } // namespace LimeReport

1
limereport/databrowser/lrsqleditdialog.h
View File

@ -73,6 +73,7 @@ private slots:
void on_rbProxy_clicked(bool checked); void on_rbProxy_clicked(bool checked);
void on_rbSubQuery_clicked(bool checked); void on_rbSubQuery_clicked(bool checked);
void on_pbAddField_clicked(); void on_pbAddField_clicked();
void on_pbDelField_clicked();
void initQueryMode(); void initQueryMode();
void initSubQueryMode(); void initSubQueryMode();
void initProxyMode(); void initProxyMode();

17
limereport/lrdatadesignintf.cpp
View File

@ -638,14 +638,17 @@ QVariant MasterDetailProxyModel::sourceData(QString fieldName, int row) const
QVariant MasterDetailProxyModel::masterData(QString fieldName) const QVariant MasterDetailProxyModel::masterData(QString fieldName) const
{ {
IDataSource* master = dataManager()->dataSource(m_masterName); IDataSource* master = dataManager()->dataSource(m_masterName);
int columnIndex = master->columnIndexByName(fieldName); if (master){
if (columnIndex!=-1){ int columnIndex = master->columnIndexByName(fieldName);
return master->data(fieldName); if (columnIndex!=-1){
} else { return master->data(fieldName);
throw ReportError( } else {
tr("Field: \"%1\" not found in \"%2\" master datasource").arg(fieldName).arg(m_masterName) throw ReportError(
); tr("Field: \"%1\" not found in \"%2\" master datasource").arg(fieldName).arg(m_masterName)
);
}
} }
return QVariant();
} }
bool CallbackDatasource::next(){ bool CallbackDatasource::next(){