Added serializer data for created_time, issues

Megh-Thakkar · Megh-Thakkar · commit 419f73a0edb3 · 2018-06-09T14:20:05.000+05:30
diff --git a/main/management/commands/updatecomponents.py b/main/management/commands/updatecomponents.py
@@ -115,6 +115,13 @@ def handle(self, *args, **options):
                     _component.license = github_data['license']['name']
                 except:
                     pass
+                try:
+                    str_date = github_data['created_at']
+                    req_date = datetime.strptime(str_date, "%Y-%m-%dT%H:%M:%S.%fZ") #This object is timezone unaware
+                    aware_date = pytz.utc.localize(req_date)    #This object is now timezone aware
+                    _component.created_time = aware_date
+                except:
+                    pass
                 _component.save()
                 print str(github_data['contributors_url']) + '?client_id=' + GITHUB_CLIENT_ID + '&client_secret=' + GITHUB_CLIENT_SECRET
                 contributors_data = get_contributors_data(str(github_data['contributors_url']) + '?client_id=' + GITHUB_CLIENT_ID + '&client_secret=' + GITHUB_CLIENT_SECRET)
diff --git a/main/serializers.py b/main/serializers.py
@@ -55,6 +55,7 @@ class Meta:
                 'name',
                 'stars',
                 'downloads',
+                'created_time',
                 'modified_time',
                 'tags',
                 'icon_url',
@@ -65,6 +66,7 @@ class Meta:
                 'forks',
                 'watchers',
                 'no_of_contributors',
+                'open_issues',
                 'version',
                 'author',
                 'author_email',
diff --git a/main/views.py b/main/views.py
@@ -21,14 +21,12 @@ def index(request):
 
 def all_components(request):    # requested on_load() for querying
     all_components = BaseComponentSerializer(Component.objects.all(), many=True)
-    print all_components
     return JsonResponse({
         'all_components':all_components.data,
         })
 
 def top_components(request):
     top_components = TopComponentSerializer(Component.objects.all().order_by('-downloads')[:10], many=True)
-    print top_components
     return JsonResponse({
         'top_components':top_components.data,
         })
diff --git a/static/admin/css/base.css b/static/admin/css/base.css
@@ -187,11 +187,15 @@ p.mini {
     margin-top: -3px;
 }
 
-.help, p.help, form p.help {
+.help, p.help, form p.help, div.help, form div.help, div.help li {
     font-size: 11px;
     color: #999;
 }
 
+div.help ul {
+     margin-bottom: 0;
+}
+
 .help-tooltip {
     cursor: help;
 }
@@ -410,6 +414,9 @@ input, textarea, select, .form-row p, form .button {
     font-weight: normal;
     font-size: 13px;
 }
+.form-row div.help {
+    padding: 2px 3px;
+}
 
 textarea {
     vertical-align: top;
@@ -731,7 +738,7 @@ a.deletelink:focus, a.deletelink:hover {
 
 .object-tools a.viewsitelink, .object-tools a.golink,.object-tools a.addlink {
     background-repeat: no-repeat;
-    background-position: 93% center;
+    background-position: right 7px center;
     padding-right: 26px;
 }
 
diff --git a/static/admin/css/changelists.css b/static/admin/css/changelists.css
@@ -166,6 +166,8 @@
 #changelist-filter a {
     display: block;
     color: #999;
+    text-overflow: ellipsis;
+    overflow-x: hidden;
 }
 
 #changelist-filter li.selected {
diff --git a/static/admin/css/dashboard.css b/static/admin/css/dashboard.css
@@ -21,9 +21,6 @@
 
 ul.actionlist li {
     list-style-type: none;
-}
-
-ul.actionlist li {
     overflow: hidden;
     text-overflow: ellipsis;
     -o-text-overflow: ellipsis;
diff --git a/static/admin/css/forms.css b/static/admin/css/forms.css
@@ -83,7 +83,7 @@ form ul.inline li {
     height: 26px;
 }
 
-.aligned label + p {
+.aligned label + p, .aligned label + div.help, .aligned label + div.readonly {
     padding: 6px 0;
     margin-top: 0;
     margin-bottom: 0;
@@ -115,26 +115,32 @@ form .aligned ul.radiolist {
     padding: 0;
 }
 
-form .aligned p.help {
+form .aligned p.help,
+form .aligned div.help {
     clear: left;
     margin-top: 0;
     margin-left: 160px;
     padding-left: 10px;
 }
 
-form .aligned label + p.help {
+form .aligned label + p.help,
+form .aligned label + div.help {
     margin-left: 0;
     padding-left: 0;
 }
 
-form .aligned p.help:last-child {
+form .aligned p.help:last-child,
+form .aligned div.help:last-child {
     margin-bottom: 0;
     padding-bottom: 0;
 }
 
 form .aligned input + p.help,
 form .aligned textarea + p.help,
-form .aligned select + p.help {
+form .aligned select + p.help,
+form .aligned input + div.help,
+form .aligned textarea + div.help,
+form .aligned select + div.help {
     margin-left: 160px;
     padding-left: 10px;
 }
@@ -156,15 +162,17 @@ form .aligned table p {
     padding: 0 0 5px 5px;
 }
 
-.aligned .vCheckboxLabel + p.help {
+.aligned .vCheckboxLabel + p.help,
+.aligned .vCheckboxLabel + div.help {
     margin-top: -4px;
 }
 
 .colM .aligned .vLargeTextField, .colM .aligned .vXMLLargeTextField {
     width: 610px;
 }
 
-.checkbox-row p.help {
+.checkbox-row p.help,
+.checkbox-row div.help {
     margin-left: 0;
     padding-left: 0;
 }
@@ -180,14 +188,22 @@ fieldset .field-box {
     width: 200px;
 }
 
-form .wide p, form .wide input + p.help {
+form .wide p,
+form .wide input + p.help,
+form .wide input + div.help {
     margin-left: 200px;
 }
 
-form .wide p.help {
+form .wide p.help,
+form .wide div.help {
     padding-left: 38px;
 }
 
+form div.help ul {
+    padding-left: 0;
+    margin-left: 0;
+}
+
 .colM fieldset.wide .vLargeTextField, .colM fieldset.wide .vXMLLargeTextField {
     width: 450px;
 }
diff --git a/static/admin/css/rtl.css b/static/admin/css/rtl.css
@@ -166,6 +166,10 @@ thead th.sorted .text {
     margin-left: 5px;
 }
 
+form .aligned p.help, form .aligned div.help {
+    clear: right;
+}
+
 form ul.inline li {
     float: right;
     padding-right: 0;
@@ -226,6 +230,10 @@ form .form-row p.datetime {
     overflow: hidden;
 }
 
+.related-widget-wrapper {
+    float: right;
+}
+
 /* MISC */
 
 .inline-related h2, .inline-group h2 {
diff --git a/static/admin/js/admin/RelatedObjectLookups.js b/static/admin/js/admin/RelatedObjectLookups.js
@@ -162,7 +162,7 @@
             }
         });
         $('.related-widget-wrapper select').trigger('change');
-        $('.related-lookup').click(function(e) {
+        $('body').on('click', '.related-lookup', function(e) {
             e.preventDefault();
             var event = $.Event('django:lookup-related');
             $(this).trigger(event);
diff --git a/static/admin/js/change_form.js b/static/admin/js/change_form.js
@@ -4,7 +4,7 @@
     'use strict';
     $(document).ready(function() {
         var modelName = $('#django-admin-form-add-constants').data('modelName');
-        $('.add-another').click(function(e) {
+        $('body').on('click', '.add-another', function(e) {
             e.preventDefault();
             var event = $.Event('django:add-another-related');
             $(this).trigger(event);
diff --git a/static/admin/js/inlines.js b/static/admin/js/inlines.js
@@ -44,17 +44,19 @@
             $(this).not("." + options.emptyCssClass).addClass(options.formCssClass);
         });
         if ($this.length && showAddButton) {
-            var addButton;
-            if ($this.prop("tagName") === "TR") {
-                // If forms are laid out as table rows, insert the
-                // "add" button in a new table row:
-                var numCols = this.eq(-1).children().length;
-                $parent.append('<tr class="' + options.addCssClass + '"><td colspan="' + numCols + '"><a href="#">' + options.addText + "</a></tr>");
-                addButton = $parent.find("tr:last a");
-            } else {
-                // Otherwise, insert it immediately after the last form:
-                $this.filter(":last").after('<div class="' + options.addCssClass + '"><a href="#">' + options.addText + "</a></div>");
-                addButton = $this.filter(":last").next().find("a");
+            var addButton = options.addButton;
+            if (addButton === null) {
+                if ($this.prop("tagName") === "TR") {
+                    // If forms are laid out as table rows, insert the
+                    // "add" button in a new table row:
+                    var numCols = this.eq(-1).children().length;
+                    $parent.append('<tr class="' + options.addCssClass + '"><td colspan="' + numCols + '"><a href="#">' + options.addText + "</a></tr>");
+                    addButton = $parent.find("tr:last a");
+                } else {
+                    // Otherwise, insert it immediately after the last form:
+                    $this.filter(":last").after('<div class="' + options.addCssClass + '"><a href="#">' + options.addText + "</a></div>");
+                    addButton = $this.filter(":last").next().find("a");
+                }
             }
             addButton.click(function(e) {
                 e.preventDefault();
@@ -137,7 +139,8 @@
         emptyCssClass: "empty-row",    // CSS class applied to the empty row
         formCssClass: "dynamic-form",  // CSS class applied to each form in a formset
         added: null,          // Function called each time a new form is added
-        removed: null          // Function called each time a form is deleted
+        removed: null,          // Function called each time a form is deleted
+        addButton: null       // Existing add button to use
     };
 
 
@@ -201,7 +204,8 @@
                 reinitDateTimeShortCuts();
                 updateSelectFilter();
                 alternatingRows(row);
-            }
+            },
+            addButton: options.addButton
         });
 
         return $rows;
@@ -267,7 +271,8 @@
                 reinitDateTimeShortCuts();
                 updateSelectFilter();
                 updateInlineLabel(row);
-            }
+            },
+            addButton: options.addButton
         });
 
         return $rows;
diff --git a/static/admin/js/inlines.min.js b/static/admin/js/inlines.min.js
diff --git a/tests/test_views.py b/tests/test_views.py

Original file line number	Diff line number	Diff line change
`@@ -187,11 +187,15 @@ p.mini {`
`187`	`187`	`margin-top: -3px;`
`188`	`188`	`}`
`189`	`189`
`190`		`-.help, p.help, form p.help {`
	`190`	`+.help, p.help, form p.help, div.help, form div.help, div.help li {`
`191`	`191`	`font-size: 11px;`
`192`	`192`	`color: #999;`
`193`	`193`	`}`
`194`	`194`
	`195`	`+div.help ul {`
	`196`	`+ margin-bottom: 0;`
	`197`	`+}`
	`198`	`+`
`195`	`199`	`.help-tooltip {`
`196`	`200`	`cursor: help;`
`197`	`201`	`}`
`@@ -410,6 +414,9 @@ input, textarea, select, .form-row p, form .button {`
`410`	`414`	`font-weight: normal;`
`411`	`415`	`font-size: 13px;`
`412`	`416`	`}`
	`417`	`+.form-row div.help {`
	`418`	`+ padding: 2px 3px;`
	`419`	`+}`
`413`	`420`
`414`	`421`	`textarea {`
`415`	`422`	`vertical-align: top;`
`@@ -731,7 +738,7 @@ a.deletelink:focus, a.deletelink:hover {`
`731`	`738`
`732`	`739`	`.object-tools a.viewsitelink, .object-tools a.golink,.object-tools a.addlink {`
`733`	`740`	`background-repeat: no-repeat;`
`734`		`- background-position: 93% center;`
	`741`	`+ background-position: right 7px center;`
`735`	`742`	`padding-right: 26px;`
`736`	`743`	`}`
`737`	`744`
Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,8 @@`
`166`	`166`	`#changelist-filter a {`
`167`	`167`	`display: block;`
`168`	`168`	`color: #999;`
	`169`	`+ text-overflow: ellipsis;`
	`170`	`+ overflow-x: hidden;`
`169`	`171`	`}`
`170`	`172`
`171`	`173`	`#changelist-filter li.selected {`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@`
`162`	`162`	`}`
`163`	`163`	`});`
`164`	`164`	`$('.related-widget-wrapper select').trigger('change');`
`165`		`- $('.related-lookup').click(function(e) {`
	`165`	`+ $('body').on('click', '.related-lookup', function(e) {`
`166`	`166`	`e.preventDefault();`
`167`	`167`	`var event = $.Event('django:lookup-related');`
`168`	`168`	`$(this).trigger(event);`