ADD: Param to include all certificates (also revoked ones)

[gigi.git] / src / org / cacert / gigi / dbObjects / Organisation.java

diff --git a/src/org/cacert/gigi/dbObjects/Organisation.java b/src/org/cacert/gigi/dbObjects/Organisation.java
index 633412c440fff98732c4fdfc11a0e9bfe2505cfa..407fcb5916c2c7fff3bf1605639b44333a6b3f04 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/Organisation.java
+++ b/src/org/cacert/gigi/dbObjects/Organisation.java
@@ -138,7 +138,7 @@ public class Organisation extends CertificateOwner {
     }
 
     public static Organisation[] getOrganisations(int offset, int count) {
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM organisations LIMIT ?,?");
+        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT certOwners.id FROM organisations inner join certOwners on certOwners.id=organisations.id where certOwners.deleted is null LIMIT ?,?");
         ps.setInt(1, offset);
         ps.setInt(2, count);
         GigiResultSet res = ps.executeQuery();
@@ -153,7 +153,7 @@ public class Organisation extends CertificateOwner {
     }
 
     public void update(String o, String c, String st, String l) {
-        for (Certificate cert : getCertificates()) {
+        for (Certificate cert : getCertificates(false)) {
             if (cert.getStatus() == CertificateStatus.ISSUED) {
                 cert.revoke();
             }