Merge branch 'master' of https://bitbucket.org/yackob03/quay

endpoints/api.py

@@ -1557,7 +1557,7 @@ def org_invoices_api(orgname):
       'attempted': i.attempted,
       'closed': i.closed,
       'total': i.total,
-      'plan': i.lines.data[0].plan.id
+      'plan': i.lines.data[0].plan.id if i.lines.data[0].plan else None
     }
     
   permission = AdministerOrganizationPermission(orgname)

static/js/graphing.js

@@ -1274,7 +1274,6 @@ function LogUsageChart(titleMap) {
   this.colorScale_ = d3.scale.category20();
 }
 
-
 /**
  * Builds the D3-representation of the data.
  */
@@ -1491,7 +1490,7 @@ LogUsageChart.prototype.draw = function(container, logData) {
     // Create the x-axis domain to encompass a week from today.
     var domain = [];
     var datetime = new Date();
-    datetime = new Date(datetime.getFullYear(), datetime.getMonth(), datetime.getDate());
+    datetime = new Date(datetime.getUTCFullYear(), datetime.getUTCMonth(), datetime.getUTCDate());
     for (var i = 7; i >= 0; --i) {
       domain.push(offsetDate(datetime, -1 * i));
     }

static/partials/org-admin.html

@@ -93,7 +93,7 @@
                       </dd>
                       <dt>Plan</dt>
                       <dd>
-                        <span>{{ plan_map[invoice.plan].title }}</span>
+                        <span>{{ invoice.plan ? plan_map[invoice.plan].title : '(N/A)' }}</span>
                       </dd>
                     </dl>
                   </td>

templates/index.html

@@ -22,7 +22,7 @@
 
   <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.2.1/moment.min.js"></script>
 
-  <script src="//cdnjs.cloudflare.com/ajax/libs/d3/3.3.10/d3.min.js"></script>
+  <script src="//cdnjs.cloudflare.com/ajax/libs/d3/3.3.3/d3.min.js"></script>
   <script src="static/lib/nv.d3.min.js"></script>
 
   <script src="static/lib/ZeroClipboard.min.js"></script>