Merge pull request #1296 from isb-cgc/sprint-35-sp

#2605 fix
isb-cgc · Jun 17, 2019 · d6a9c73 · d6a9c73
2 parents c1545f8 + 55e3f65
commit d6a9c73
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 45 deletions.
diff --git a/GenespotRE/settings.py b/GenespotRE/settings.py
@@ -79,8 +79,6 @@
 
 # Data Buckets
 OPEN_DATA_BUCKET        = os.environ.get('OPEN_DATA_BUCKET', '')
-DCC_CONTROLLED_DATA_BUCKET = os.environ.get('DCC_CONTROLLED_DATA_BUCKET', '')
-CGHUB_CONTROLLED_DATA_BUCKET = os.environ.get('CGHUB_CONTROLLED_DATA_BUCKET', '')
 GCLOUD_BUCKET           = os.environ.get('GOOGLE_STORAGE_BUCKET')
 
 # BigQuery cohort storage settings
@@ -454,8 +452,6 @@ def GET_BQ_COHORT_SETTINGS():
 OPEN_ACL_GOOGLE_GROUP                   = os.environ.get('OPEN_ACL_GOOGLE_GROUP', '')
 GOOGLE_GROUP_ADMIN                      = os.environ.get('GOOGLE_GROUP_ADMIN', '')
 SUPERADMIN_FOR_REPORTS                  = os.environ.get('SUPERADMIN_FOR_REPORTS', '')
-ERA_LOGIN_URL                           = os.environ.get('ERA_LOGIN_URL', '')
-SAML_FOLDER                             = os.environ.get('SAML_FOLDER', '')
 
 # TaskQueue used when users go through the ERA flow
 LOGOUT_WORKER_TASKQUEUE                  = os.environ.get('LOGOUT_WORKER_TASKQUEUE', '')

diff --git a/GenespotRE/settings_unit_test.py b/GenespotRE/settings_unit_test.py
@@ -291,12 +291,7 @@
 #################################
 
 LOGIN_EXPIRATION_HOURS = 24
-FAKE_DBGAP_AUTHENTICATION_LIST_FILENAME = os.environ.get('FAKE_DBGAP_AUTHENTICATION_LIST_FILENAME', '') # This should be removed in favour of putting the change in .env files
-DBGAP_AUTHENTICATION_LIST_FILENAME      = os.environ.get('DBGAP_AUTHENTICATION_LIST_FILENAME', '')
-DBGAP_AUTHENTICATION_LIST_BUCKET        = os.environ.get('DBGAP_AUTHENTICATION_LIST_BUCKET', '')
 GOOGLE_GROUP_ADMIN                      = os.environ.get('GOOGLE_GROUP_ADMIN', '')
 SUPERADMIN_FOR_REPORTS                  = os.environ.get('SUPERADMIN_FOR_REPORTS', '')
 OPEN_ACL_GOOGLE_GROUP                   = os.environ.get('OPEN_ACL_GOOGLE_GROUP', '')
-ERA_LOGIN_URL                           = os.environ.get('ERA_LOGIN_URL', '')
-SAML_FOLDER                             = os.environ.get('SAML_FOLDER')
 
diff --git a/GenespotRE/views.py b/GenespotRE/views.py
@@ -53,7 +53,6 @@
 debug = settings.DEBUG
 logger = logging.getLogger('main_logger')
 
-ERA_LOGIN_URL = settings.ERA_LOGIN_URL
 OPEN_ACL_GOOGLE_GROUP = settings.OPEN_ACL_GOOGLE_GROUP
 BQ_ATTEMPT_MAX = 10
 WEBAPP_LOGIN_LOG_NAME = settings.WEBAPP_LOGIN_LOG_NAME
@@ -158,8 +157,7 @@ def user_detail(request, user_id):
         return render(request, 'GenespotRE/user_detail.html',
                       {'request': request,
                        'user': user,
-                       'user_details': user_details,
-                       'ERA_LOGIN_URL': settings.ERA_LOGIN_URL
+                       'user_details': user_details
                        })
     else:
         return render(request, '403.html')

diff --git a/templates/projects/system_data_dict.html b/templates/projects/system_data_dict.html
@@ -21,41 +21,33 @@ <h1 class="page-header">System Data Dictionaries</h1>
 <div class="container">
     <div class="tabpanel" role="tabpanel">
         <ul class="nav nav-tabs" role="tablist">
-            {% with attr_list_all.items|first as first_object %}
-                {% with first_object.0 as first_key %}
-                    {% for key in attr_list_all %}
-                    <li role="presentation" class="{% if key == first_key %}active{% endif %}"><a href="#dict-{{ key }}" role="tab" data-toggle="tab" title="{{ key }} Dictionary">{{ key }}</a></li>
-                    {% endfor %}
-                {% endwith %}
-            {% endwith %}
+            {% for key in attr_list_all %}
+                <li role="presentation" class="{% if forloop.counter == 1 %}active{% endif %}"><a href="#dict-{{ key }}" role="tab" data-toggle="tab" title="{{ key }} Dictionary">{{ key }}</a></li>
+            {% endfor %}
         </ul>
         <div class="tab-content">
-            {% with attr_list_all.items|first as first_object %}
-                {% with first_object.0 as first_key %}
-                    {% for key, values in attr_list_all.items %}
-                    <div role="tabpanel" class="tab-pane {% if key == first_key %}active{% endif %}" id="dict-{{ key }}">
-                        <table class="table table-striped">
-                            <thead>
-                                <tr>
-                                    <th nowrap>System Attribute Name</th>
-                                    <th>Type</th>
-                                    <th>Possible Values</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {% for attr in values %}
-                                <tr>
-                                    <td>{{ attr.name }}</td>
-                                    <td>{{ attr.type }}</td>
-                                    <td>{{ attr.values }}</td>
-                                </tr>
-                                {% endfor %}
-                            </tbody>
-                        </table>
-                    </div>
-                    {% endfor %}
-                {% endwith %}
-            {% endwith %}
+                {% for key, values in attr_list_all.items %}
+                <div role="tabpanel" class="tab-pane {% if forloop.counter == 1 %}active{% endif %}" id="dict-{{ key }}">
+                    <table class="table table-striped">
+                        <thead>
+                            <tr>
+                                <th nowrap>System Attribute Name</th>
+                                <th>Type</th>
+                                <th>Possible Values</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {% for attr in values %}
+                            <tr>
+                                <td>{{ attr.name }}</td>
+                                <td>{{ attr.type }}</td>
+                                <td>{{ attr.values }}</td>
+                            </tr>
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+                {% endfor %}
         </div>
     </div>
 </div>