summaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorramon <ramongomez@us.es>2016-05-13 16:34:33 +0000
committerramon <ramongomez@us.es>2016-05-13 16:34:33 +0000
commitac933ca816520c5495a07c255b399463d4b4fefe (patch)
treeb85d6a13a057d24895bfff7b9f3d1dd47762c05d /admin
parentf29a575da24f9589f29d31cf6b15e220c60118cd (diff)
#713 #743: Corregir erratas de revisiones r4906 y r4927.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@4929 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'admin')
-rw-r--r--admin/Database/ogAdmBD.sql2
-rw-r--r--admin/Sources/Services/ogAdmServer/sources/ogAdmServer.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/admin/Database/ogAdmBD.sql b/admin/Database/ogAdmBD.sql
index a1571081..10cb7f51 100644
--- a/admin/Database/ogAdmBD.sql
+++ b/admin/Database/ogAdmBD.sql
@@ -746,7 +746,7 @@ CREATE TABLE IF NOT EXISTS `repositorios` (
PRIMARY KEY (`idrepositorio`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-INSERT INTO `repositorios` (`idrepositorio`,`nombrerepositorio`,`ip`,`passguor`,`idcentro`,`grupoid`,`comentarios`,`puertorepo`) VALUES
+INSERT INTO `repositorios` (`idrepositorio`,`nombrerepositorio`,`ip`,`passguor`,`idcentro`,`grupoid`,`comentarios`,`puertorepo`,`apikey`) VALUES
(1,'Repositorio (Default)','SERVERIP','',1,0,'',2002,'REPOKEY');
diff --git a/admin/Sources/Services/ogAdmServer/sources/ogAdmServer.cpp b/admin/Sources/Services/ogAdmServer/sources/ogAdmServer.cpp
index 853a7337..187a5337 100644
--- a/admin/Sources/Services/ogAdmServer/sources/ogAdmServer.cpp
+++ b/admin/Sources/Services/ogAdmServer/sources/ogAdmServer.cpp
@@ -747,7 +747,7 @@ BOOLEAN actualizaConfiguracion(Database db, Table tbl, char* cfg, int ido)
if (strlen(ser) > 0) {
// Solo actualizar si número de serie no existía.
sprintf(sqlstr, "UPDATE ordenadores SET numserie='%s'"
- " WHERE idordenador=%d AND numserie=''",
+ " WHERE idordenador=%d AND numserie IS NULL",
ser, ido);
if (!db.Execute(sqlstr, tbl)) { // Error al insertar
db.GetErrorErrStr(msglog);