fixes

Author: previ

coderbot/activity.py

@@ -69,4 +69,4 @@ def delete(self, name, logical = True):
 
     def list(self, active_only = True):
         with self.lock: 
-            return self.activities.all()
+            return self.activities.search(self.query.status == ACTIVITY_STATUS_ACTIVE)

coderbot/api.py

@@ -301,7 +301,7 @@ def saveProgram(name, body):
     logging.info("saving - name: %s, body: %s", name, str(existing_program))
     if existing_program is not None and not overwrite:
         return "askOverwrite"
-    elif existing_program is not None and existing_program.is_default() == True:
+    elif existing_program is not None and existing_program.is_stock() == True:
         return "defaultCannotOverwrite", 400
     program = Program(name=body.get("name"), code=body.get("code"), dom_code=body.get("dom_code"), modified=datetime.now(), status="active")
     prog_engine.save(program)

coderbot/program.py

@@ -127,10 +127,14 @@ def save(self, program):
             else:
                 self._programs.insert(program_db_entry)
 
-    def load(self, name):
+    def load(self, name, active_only=True):
         with self.lock: 
             query = Query()
-            program_db_entries = self._programs.search(query.name == name)
+            program_db_entries = None
+            if active_only:
+                program_db_entries = self._programs.search((query.name == name) & (query.status == PROGRAM_STATUS_ACTIVE)) 
+            else:
+                program_db_entries = self._programs.search(query.name == name)
             if len(program_db_entries) > 0:
                 prog_db_entry = program_db_entries[0]
                 #logging.debug(prog_db_entry)