mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-08-16 08:34:12 +02:00
2021-04-16 Fred Gleason <fredg@paravelsystems.com>
* Fixed a copy-paste typo in the 'updateRowLine()' method of the following classes: 'RDFeedListModel', 'RDGroupListModel', 'RDLogListModel', 'RDReplicatorListModel', 'RDSchedCodeListModel', 'RDServiceListModel', 'RDUserListModel'. * Removed the 'RDLogImportModel::updateRowLine()' method. Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
parent
3887d806b0
commit
1b7dd5cd7d
@ -21448,3 +21448,9 @@
|
|||||||
* Fixed a bug in rdadmin(1) that caused the incorrect hostname to
|
* Fixed a bug in rdadmin(1) that caused the incorrect hostname to
|
||||||
populate in the 'Name' column after creating a new host entry in
|
populate in the 'Name' column after creating a new host entry in
|
||||||
the 'Rivendell Host List' dialog.
|
the 'Rivendell Host List' dialog.
|
||||||
|
2021-04-16 Fred Gleason <fredg@paravelsystems.com>
|
||||||
|
* Fixed a copy-paste typo in the 'updateRowLine()' method of
|
||||||
|
the following classes: 'RDFeedListModel', 'RDGroupListModel',
|
||||||
|
'RDLogListModel', 'RDReplicatorListModel', 'RDSchedCodeListModel',
|
||||||
|
'RDServiceListModel', 'RDUserListModel'.
|
||||||
|
* Removed the 'RDLogImportModel::updateRowLine()' method.
|
||||||
|
@ -519,7 +519,7 @@ void RDFeedListModel::updateRowLine(int line)
|
|||||||
{
|
{
|
||||||
QString sql=sqlFields()+
|
QString sql=sqlFields()+
|
||||||
"where "+
|
"where "+
|
||||||
"FEEDS.KEY_NAME=\""+RDEscapeString(d_key_names.at(line).at(0))+"\"";
|
"FEEDS.KEY_NAME=\""+RDEscapeString(d_key_names.at(line).at(line))+"\"";
|
||||||
RDSqlQuery *q=new RDSqlQuery(sql);
|
RDSqlQuery *q=new RDSqlQuery(sql);
|
||||||
if(q->first()) {
|
if(q->first()) {
|
||||||
updateRow(line,q);
|
updateRow(line,q);
|
||||||
|
@ -349,7 +349,7 @@ void RDGroupListModel::updateRowLine(int line)
|
|||||||
{
|
{
|
||||||
if(line<d_texts.size()) {
|
if(line<d_texts.size()) {
|
||||||
QString sql=sqlFields()+
|
QString sql=sqlFields()+
|
||||||
"where NAME=\""+RDEscapeString(d_texts.at(line).at(0).toString())+"\"";
|
"where NAME=\""+RDEscapeString(d_texts.at(line).at(line).toString())+"\"";
|
||||||
RDSqlQuery *q=new RDSqlQuery(sql);
|
RDSqlQuery *q=new RDSqlQuery(sql);
|
||||||
if(q->first()) {
|
if(q->first()) {
|
||||||
updateRow(line,q);
|
updateRow(line,q);
|
||||||
|
@ -189,21 +189,6 @@ void RDLogImportModel::updateModel()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void RDLogImportModel::updateRowLine(int line)
|
|
||||||
{
|
|
||||||
if(line<d_texts.size()) {
|
|
||||||
QString sql=sqlFields()+
|
|
||||||
"where "+
|
|
||||||
QString().sprintf("IMPORTER_LINES.ID=%u",d_ids.at(line));
|
|
||||||
RDSqlQuery *q=new RDSqlQuery(sql);
|
|
||||||
if(q->first()) {
|
|
||||||
updateRow(line,q);
|
|
||||||
}
|
|
||||||
delete q;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void RDLogImportModel::updateRow(int row,RDSqlQuery *q)
|
void RDLogImportModel::updateRow(int row,RDSqlQuery *q)
|
||||||
{
|
{
|
||||||
QList<QVariant> texts;
|
QList<QVariant> texts;
|
||||||
|
@ -48,7 +48,6 @@ class RDLogImportModel : public QAbstractTableModel
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
void updateModel();
|
void updateModel();
|
||||||
void updateRowLine(int line);
|
|
||||||
void updateRow(int row,RDSqlQuery *q);
|
void updateRow(int row,RDSqlQuery *q);
|
||||||
QString sqlFields() const;
|
QString sqlFields() const;
|
||||||
|
|
||||||
|
@ -268,7 +268,7 @@ void RDLogListModel::updateRowLine(int line)
|
|||||||
{
|
{
|
||||||
if(line<d_texts.size()) {
|
if(line<d_texts.size()) {
|
||||||
QString sql=sqlFields()+
|
QString sql=sqlFields()+
|
||||||
"where NAME=\""+RDEscapeString(d_texts.at(line).at(0).toString())+"\"";
|
"where NAME=\""+RDEscapeString(d_texts.at(line).at(line).toString())+"\"";
|
||||||
RDSqlQuery *q=new RDSqlQuery(sql);
|
RDSqlQuery *q=new RDSqlQuery(sql);
|
||||||
if(q->first()) {
|
if(q->first()) {
|
||||||
updateRow(line,q);
|
updateRow(line,q);
|
||||||
|
@ -243,7 +243,7 @@ void RDReplicatorListModel::updateRowLine(int line)
|
|||||||
if(line<d_texts.size()) {
|
if(line<d_texts.size()) {
|
||||||
QString sql=sqlFields()+
|
QString sql=sqlFields()+
|
||||||
"where REPLICATORS.NAME=\""+
|
"where REPLICATORS.NAME=\""+
|
||||||
RDEscapeString(d_texts.at(line).at(0).toString())+"\"";
|
RDEscapeString(d_texts.at(line).at(line).toString())+"\"";
|
||||||
RDSqlQuery *q=new RDSqlQuery(sql);
|
RDSqlQuery *q=new RDSqlQuery(sql);
|
||||||
if(q->first()) {
|
if(q->first()) {
|
||||||
updateRow(line,q);
|
updateRow(line,q);
|
||||||
|
@ -244,7 +244,7 @@ void RDSchedCodeListModel::updateRowLine(int line)
|
|||||||
{
|
{
|
||||||
if(line<d_texts.size()) {
|
if(line<d_texts.size()) {
|
||||||
QString sql=sqlFields()+
|
QString sql=sqlFields()+
|
||||||
"where CODE=\""+RDEscapeString(d_texts.at(line).at(0).toString())+"\"";
|
"where CODE=\""+RDEscapeString(d_texts.at(line).at(line).toString())+"\"";
|
||||||
RDSqlQuery *q=new RDSqlQuery(sql);
|
RDSqlQuery *q=new RDSqlQuery(sql);
|
||||||
if(q->first()) {
|
if(q->first()) {
|
||||||
updateRow(line,q);
|
updateRow(line,q);
|
||||||
|
@ -265,7 +265,7 @@ void RDServiceListModel::updateRowLine(int line)
|
|||||||
{
|
{
|
||||||
if(line<d_texts.size()) {
|
if(line<d_texts.size()) {
|
||||||
QString sql=sqlFields()+
|
QString sql=sqlFields()+
|
||||||
"where NAME=\""+RDEscapeString(d_texts.at(line).at(0).toString())+"\"";
|
"where NAME=\""+RDEscapeString(d_texts.at(line).at(line).toString())+"\"";
|
||||||
RDSqlQuery *q=new RDSqlQuery(sql);
|
RDSqlQuery *q=new RDSqlQuery(sql);
|
||||||
if(q->first()) {
|
if(q->first()) {
|
||||||
updateRow(line,q);
|
updateRow(line,q);
|
||||||
|
@ -268,7 +268,7 @@ void RDUserListModel::updateRowLine(int line)
|
|||||||
{
|
{
|
||||||
if(line<d_texts.size()) {
|
if(line<d_texts.size()) {
|
||||||
QString sql=sqlFields()+
|
QString sql=sqlFields()+
|
||||||
filterSql(d_texts.at(line).at(0).toString());
|
filterSql(d_texts.at(line).at(line).toString());
|
||||||
RDSqlQuery *q=new RDSqlQuery(sql);
|
RDSqlQuery *q=new RDSqlQuery(sql);
|
||||||
if(q->first()) {
|
if(q->first()) {
|
||||||
updateRow(line,q);
|
updateRow(line,q);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user