user collaboration

crane-cloud · Jun 21, 2023 · fd07bc7 · fd07bc7
1 parent be438ba
commit fd07bc7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/app/controllers/statuses.py b/app/controllers/statuses.py
@@ -1,7 +1,7 @@
 
 from imp import reload
 import os
-from time import clock_settime
+#from time import clock_settime
 
 import requests
 from yaml import scan

diff --git a/app/helpers/user_to_project_notification.py b/app/helpers/user_to_project_notification.py
@@ -1,10 +1,13 @@
 from flask import render_template
 from .email import send_email
+from flask import Flask, request
 
 
 def send_user_to_project_notification( email, name, app, template, subject, date, project_name, email_role, success):
- html = render_template(template, 
- email=email, 
+ client_base_url = f'https://{request.host}/register'
+ html = render_template(template,
+ email=email,
+ client_base_url=client_base_url,
  name=name, 
  date= date,
  project_name = project_name,

diff --git a/config/config.py b/config/config.py
@@ -37,7 +37,7 @@ class Development(Base):
  """ development config """
 
  DEBUG = True
- # SQLALCHEMY_DATABASE_URI = "postgresql://postgres:postgres@database/cranecloud"
+ # SQLALCHEMY_DATABASE_URI = "postgresql://postgress:postgres@database/cranecloud"
  SQLALCHEMY_DATABASE_URI = os.getenv("DATABASE_URI", "postgresql:///cranecloud")
  MONGO_URI = os.getenv("MONGO_URI", "mongodb://localhost:27017/cranecloud")
 

diff --git a/templates/user/anonymous_user_to_project.html b/templates/user/anonymous_user_to_project.html
@@ -186,7 +186,7 @@
  <tr>
  <td align="center" style="border-radius: 3px" bgcolor="#008AC1">
  <a
- href="https://cranecloud.io/register"
+ href={{client_based_url}}
  target="_blank"
  style="
  font-size: 20px;

diff --git a/templates/user/user_to_project.html b/templates/user/user_to_project.html
@@ -185,7 +185,7 @@
  <tr>
  <td align="center" style="border-radius: 3px" bgcolor="#008AC1">
  <a
- href="https://app.cranecloud.io/login"
+ href={{client_based_url}}
  target="_blank"
  style="
  font-size: 20px;