mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-09 05:57:14 +03:00
Code Activity

Variables access has been fixed

Browse Source
This commit is contained in:
Arin Alex
2016-08-02 01:33:26 +03:00
parent 019d213882
commit f7d8a5050a
3 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
limereport/lrdatasourcemanager.cpp
View File

@@ -208,6 +208,11 @@ void DataSourceModel::updateModel()
foreach (QString name, m_dataManager->variableNames()){
vars->addChild(name,DataNode::Variable,QIcon(":/report/images/value"));
}
vars = m_rootNode->addChild(tr("External variables"),DataNode::Variables,QIcon(":/report/images/folder"));
foreach (QString name, m_dataManager->namesOfUserVariables()){
vars->addChild(name,DataNode::Variable,QIcon(":/report/images/value"));
}
}
DataSourceManager::DataSourceManager(QObject *parent) :
@@ -1217,8 +1222,9 @@ QVariant DataSourceManager::variable(const QString &variableName)
RenderPass DataSourceManager::variablePass(const QString &name)
{
return (m_reportVariables.variablePass(name)==FirstPass)?FirstPass:SecondPass;
if (m_userVariables.containsVariable(name))
return m_userVariables.variablePass(name);
return m_reportVariables.variablePass(name);
}
bool DataSourceManager::variableIsSystem(const QString &name)