Merge branch 'staging' into add-celery-job-for-sending-tos

atst/models/environment.py

@@ -61,6 +61,10 @@ class Environment(
     def portfolio_id(self):
         return self.application.portfolio_id
 
+    @property
+    def is_pending(self):
+        return self.cloud_id is None
+
     def __repr__(self):
         return "<Environment(name='{}', num_users='{}', application='{}', portfolio='{}', id='{}')>".format(
             self.name,

atst/routes/applications/settings.py

@@ -39,6 +39,7 @@ def get_environments_obj_for_app(application):
             {
                 "id": env.id,
                 "name": env.name,
+                "pending": env.is_pending,
                 "edit_form": EditEnvironmentForm(obj=env),
                 "member_count": len(env.roles),
                 "members": sorted(

templates/applications/fragments/environments.html

@@ -47,7 +47,7 @@
                         <span>
                           {{ env['name'] }}
                         </span>
-                        {{ Label(type="pending_creation", classes='label--below')}}
+                        {{ Label(type="pending_creation")}}
                       {%- endif %}
                       {% if user_can(permissions.EDIT_ENVIRONMENT) -%}
                         {{