Commit 556ee616d1c7ef94f1ffa7102c12624272e2487e

Authored by Alain Klotz
2 parents 9b6af71d e057a49a
Exists in dev

Merge branch 'dev' of https://gitlab.irap.omp.eu/pyros-irap/pyros into dev

src/core/pyros_django/majordome/agent/Agent.py
@@ -3517,7 +3517,9 @@ class Agent: @@ -3517,7 +3517,9 @@ class Agent:
3517 ephem_target = pickle.load(open(eph_file,"rb")) 3517 ephem_target = pickle.load(open(eph_file,"rb"))
3518 self._oc['config'].fn.fcontext = fcontext0 3518 self._oc['config'].fn.fcontext = fcontext0
3519 return ephem_target 3519 return ephem_target
  3520 +
3520 3521
  3522 +
3521 """ 3523 """
3522 ================================================================= 3524 =================================================================
3523 MAIN 3525 MAIN
@@ -3539,6 +3541,7 @@ def parse_args(args): @@ -3539,6 +3541,7 @@ def parse_args(args):
3539 parser = argparse.ArgumentParser(description='Start an agent.') 3541 parser = argparse.ArgumentParser(description='Start an agent.')
3540 parser.add_argument("--computer",dest="computer",help='Launch agent with simulated computer hostname',action="store") 3542 parser.add_argument("--computer",dest="computer",help='Launch agent with simulated computer hostname',action="store")
3541 parser.add_argument("-t", action="store_true") 3543 parser.add_argument("-t", action="store_true")
  3544 + parser.add_argument("-d", action="store_true" )
3542 args = vars(parser.parse_args(args)) 3545 args = vars(parser.parse_args(args))
3543 return args 3546 return args
3544 3547
src/core/pyros_django/user_mgmt/models.py
@@ -423,7 +423,7 @@ class Period(models.Model): @@ -423,7 +423,7 @@ class Period(models.Model):
423 today = timezone.now().date() 423 today = timezone.now().date()
424 return today >= self.notification_start_date 424 return today >= self.notification_start_date
425 425
426 - def get_period_id_as_str(self) -> str: 426 + def get_id_as_str(self) -> str:
427 """ 427 """
428 Return period_id as P+period_id 428 Return period_id as P+period_id
429 429