Merge pull request #248 from compute-tooling/v1-fixups

1.0 Fixups
compute-tooling · Jan 17, 2020 · 1910a22 · 1910a22
2 parents 8574fa0 + 628bf6a
commit 1910a22
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 10 deletions.
diff --git a/src/Simulation/Description.tsx b/src/Simulation/Description.tsx
@@ -356,7 +356,7 @@ export default class DescriptionComponent extends React.PureComponent<
                     : null}
                   {this.writable() ?
                     <Col className="col-sm-2 ml-sm-auto" style={{ paddingRight: 0 }}>
-                      <Tip tip={`Make this simulation ${is_public ? "private" : "public"}.`}>
+                      <Tip tip={`Make this simulation ${values.is_public ? "private" : "public"}.`}>
                         <Button variant="dark" style={{ backgroundColor: "rgba(60, 62, 62, 1)" }} className="mb-4 w-100" onClick={e => {
                           e.target.value = !values.is_public;
                           setFieldValue("is_public", !values.is_public);

diff --git a/src/Simulation/Outputs.tsx b/src/Simulation/Outputs.tsx
@@ -269,9 +269,19 @@ export default class OutputsComponent extends React.Component<
                 );
               })}
             </Row>
+            <Row className="text-center">
+              <Col>
+                <a
+                  href={`/${project.owner}/${project.title}/${remoteSim.model_pk}/download/`}
+                  className="btn btn-lg btn-match-nav">
+                  Download Results</a>
+
+              </Col>
+            </Row>
+
           </Card.Body>
         </Card>
-      </Card>
+      </Card >
     );
   }
 }
diff --git a/src/types.ts b/src/types.ts
@@ -158,6 +158,7 @@ export interface AccessStatus {
 
 export interface Project {
   title: string;
+  owner: string;
   oneliner: string;
   description: string;
   repo_url: string;

diff --git a/static/js/sim.js b/static/js/sim.js
diff --git a/templates/comp/model.html b/templates/comp/model.html
@@ -24,9 +24,7 @@ <h1 class="display-5">
                         aria-controls="project-desc-collapse">
                         README
                     </button>
-                    {% if project_status == "live" or project_status == "updating" %}
-                    <button class="btn btn-outline-success">live</button>
-                    {% else %}
+                    {% if project_status == "pending" %}
                     <button class="btn btn-outline-warning">pending</button>
                     {% endif %}
                 </div>

diff --git a/webapp/apps/comp/models.py b/webapp/apps/comp/models.py
@@ -23,9 +23,7 @@
 from webapp.settings import INPUTS_SALT
 
 
-# TODO: Update to deploy date.
-# (set to nye for testing)
-# 11:59 tonight
+# 11:59 on night of deployment
 ANON_BEFORE = datetime.datetime(
     2020, 1, 16, 23, 59, 59, tzinfo=pytz.timezone("US/Eastern")
 )

diff --git a/webapp/apps/comp/views/views.py b/webapp/apps/comp/views/views.py
@@ -54,7 +54,8 @@ class ModelPageView(InputsMixin, View):
 
     def get(self, request, *args, **kwargs):
         print("method=GET", request.GET, kwargs)
-        project = self.projects.get(
+        project = get_object_or_404(
+            self.projects,
             owner__user__username__iexact=kwargs["username"],
             title__iexact=kwargs["title"],
         )