Skip to content

Commit c455a6e

Browse files
author
Victoria Bobey
committed
fixed error from other groups erroring
1 parent 94508e2 commit c455a6e

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

mysite/socknet/templates/socknet/author_templates/remote_profile.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h1>{{ post.title }}</h1>
2828
</div>
2929
<div class="post-id-label">
3030
{{ post.visibility }} post submitted by
31-
<a class="author-label" href="{% url 'remote_profile' nodeID=post.node.id authorUUID=post.author_id %}">{{ post.author_display_name }}</a>
31+
<span class="author-label" >{{ post.author_display_name }}</span>
3232
on {{ post.published }} from {{ post.node.name }}
3333
</div>
3434
<div class="post-description">
@@ -89,7 +89,7 @@ <h2>No Posts</h2>
8989
console.log("Friend successful!");
9090
console.log(id);
9191
$('#'+id).data("status" , "Pending");
92-
$('#'+id).removeAttr("href");
92+
$('#'+id).removeAttr("href");
9393
$('#'+id).css("background-color", "#EEEEEE")
9494
$('#'+id).text("Friend Request Sent")
9595
}

mysite/socknet/views/author_views.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,9 @@ def get_context_data(self, **kwargs):
294294
try:
295295
data = json.loads(r.text)
296296
except e:
297-
posts.append(RemotePost("Json Error from "+ n.name, "Json could not be decoded", str(e), r.text, "Error", "Error", "Error", "Error", "Error"))
297+
print("Error from group: " + n.name)
298+
print(e)
299+
#posts.append(RemotePost("Json Error from "+ n.name, "Json could not be decoded", str(e), r.text, "Error", "Error", "Error", "Error", "Error"))
298300
try:
299301
for post_json in data['posts']:
300302
posts_serializer = PostsSerializer(data=post_json)
@@ -310,7 +312,9 @@ def get_context_data(self, **kwargs):
310312
posts.append(post)
311313
context['posts'] = posts
312314
except KeyError, e:
313-
posts.append(RemotePost("Key Error from "+ n.name, "Key Error on field: " + str(e), "Error", r.text, "Error", "Error", "Error", "Error", "Error"))
315+
print("Error from group: " + n.name)
316+
print(e)
317+
#posts.append(RemotePost("Key Error from "+ n.name, "Key Error on field: " + str(e), "Error", r.text, "Error", "Error", "Error", "Error", "Error"))
314318

315319
return context
316320

mysite/socknet/views/post_views.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ def get_queryset(self):
6262
try:
6363
data = json.loads(r.text)
6464
except ValueError, e:
65-
posts.append(RemotePost("0", "Json Error from "+ n.name, "Json could not be decoded", str(e), r.text, "Error", "Error", "Error", "Error", "Error"))
65+
print("Error from group: " + n.name)
66+
print(e)
67+
#posts.append(RemotePost("0", "Json Error from "+ n.name, "Json could not be decoded", str(e), r.text, "Error", "Error", "9732b4fd-3576-45db-a4a8-9bd07843c2ca", "Error", "Error"))
6668
try:
6769
for post_json in data['posts']:
6870
serializer = PostsSerializer(data=post_json)
@@ -79,7 +81,9 @@ def get_queryset(self):
7981
post_data['content'], post_data['visibility'], post_data['published'], post_author['displayName'], post_author['id'],n)
8082
posts.append(post)
8183
except KeyError, e:
82-
posts.append(RemotePost("0", "Key Error from "+ n.name, "Key Error on field: " + str(e), "Error", r.text, "Error", "Error", "Error", "Error", "Error"))
84+
print("Error from group: " + n.name)
85+
print(e)
86+
#posts.append(RemotePost("0", "Key Error from "+ n.name, "Key Error on field: " + str(e), "Error", r.text, "Error", "Error", "9732b4fd-3576-45db-a4a8-9bd07843c2ca", "Error", "Error"))
8387
return posts
8488

8589
def test_func(self):

0 commit comments

Comments
 (0)