Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-08-16 08:34:12 +02:00
Code Issues Projects Releases Wiki Activity

2021-06-10 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rdadmin(1) that threw a SQL error when attempting
	to add a new user.
	* Fixed a bug in rdadmin(1) that caused the incorrect Login Name
	to appear in the 'Rivendell User List' dialog immediately after
	adding the user.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-06-10 15:17:03 -04:00
parent 64eb9860ce
commit f7ade0d59e
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -21865,3 +21865,9 @@
2021-06-04 Fred Gleason <fredg@paravelsystems.com> 2021-06-04 Fred Gleason <fredg@paravelsystems.com>
* Corrected file permissions and ownerships for rsyslog in * Corrected file permissions and ownerships for rsyslog in
'debian/postinst'. 'debian/postinst'.
2021-06-10 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdadmin(1) that threw a SQL error when attempting
to add a new user.
* Fixed a bug in rdadmin(1) that caused the incorrect Login Name
to appear in the 'Rivendell User List' dialog immediately after
adding the user.

6
lib/rduserlistmodel.cpp
View File

@ -213,10 +213,10 @@ void RDUserListModel::refresh(const QModelIndex &row)
} }
void RDUserListModel::refresh(const QString &grpname) void RDUserListModel::refresh(const QString &username)
{ {
for(int i=0;i<d_texts.size();i++) { for(int i=0;i<d_texts.size();i++) {
if(d_texts.at(i).at(0)==grpname) { if(d_texts.at(i).at(0)==username) {
updateRowLine(i); updateRowLine(i);
return; return;
} }
@ -267,7 +267,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(line).toString()); filterSql(d_texts.at(line).at(0).toString());
RDSqlQuery *q=new RDSqlQuery(sql); RDSqlQuery *q=new RDSqlQuery(sql);
if(q->first()) { if(q->first()) {
updateRow(line,q); updateRow(line,q);

14
rdadmin/add_user.cpp
View File

@ -35,10 +35,8 @@ AddUser::AddUser(QString *username,QWidget *parent)
// //
// Fix the Window Size // Fix the Window Size
// //
setMinimumWidth(sizeHint().width()); setMinimumSize(sizeHint());
setMaximumWidth(sizeHint().width()); setMaximumSize(sizeHint());
setMinimumHeight(sizeHint().height());
setMaximumHeight(sizeHint().height());
setWindowTitle("RDAdmin - "+tr("Add User")); setWindowTitle("RDAdmin - "+tr("Add User"));
@ -104,16 +102,12 @@ void AddUser::okData()
} }
sql=QString("insert into `USERS` set ")+ sql=QString("insert into `USERS` set ")+
"`LOGIN_NAME`='"+RDEscapeString(username)+"',"+ "`LOGIN_NAME`='"+RDEscapeString(username)+"'";
"`PASSWORD`=PASSWORD('')"; if(!RDSqlQuery::apply(sql)) {
q=new RDSqlQuery(sql);
if(!q->isActive()) {
QMessageBox::warning(this,tr("User Exists"),tr("User Already Exists!"), QMessageBox::warning(this,tr("User Exists"),tr("User Already Exists!"),
1,0,0); 1,0,0);
delete q;
return; return;
} }
delete q;
sql="select `NAME` from `GROUPS`"; sql="select `NAME` from `GROUPS`";
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
while(q->next()) { while(q->next()) {