From 31e7b8d6107abd89b4bf6b2cfc32671dbd1dc255 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 24 Apr 2015 12:16:12 +0200
Subject: [PATCH] In-progress implementing usernames for share dialog

---
 .../characterSettings/shareDialog.html        | 28 +++++++++++--------
 .../characterSettings/shareDialog.js          | 12 ++++----
 .../server/publications/singleCharacter.js    | 23 ++++++++-------
 3 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/rpg-docs/client/views/character/characterSettings/shareDialog.html b/rpg-docs/client/views/character/characterSettings/shareDialog.html
index e3e8ec39..296a4990 100644
--- a/rpg-docs/client/views/character/characterSettings/shareDialog.html
+++ b/rpg-docs/client/views/character/characterSettings/shareDialog.html
@@ -1,18 +1,22 @@
 <template name="shareDialog">
 	<div>
 		<div>
-			<div class="subhead">
-				Can View
-			</div>
-			{{#each readers}}
-				{{this}}<br>
-			{{/each}}
-			<div class="subhead">
-				Can Edit
-			</div>
-			{{#each writers}}
-				{{this}}<br>
-			{{/each}}
+			{{#if writers.count}}
+				<div class="subhead">
+					Can View
+				</div>
+				{{#each readers}}
+					{{username}}<br>
+				{{/each}}
+			{{/if}}
+			{{#if writers.count}}
+				<div class="subhead">
+					Can Edit
+				</div>
+				{{#each writers}}
+					{{username}}<br>
+				{{/each}}
+			{{/if}}
 		</div>
 		<paper-input id="userNameOrEmailInput" label="Username or email" floatinglabel></paper-input><br>
 		{{#if userFindError}}<p style="color: red;">{{userFindError}}</p>{{/if}}
diff --git a/rpg-docs/client/views/character/characterSettings/shareDialog.js b/rpg-docs/client/views/character/characterSettings/shareDialog.js
index dfe2ca4e..279bea12 100644
--- a/rpg-docs/client/views/character/characterSettings/shareDialog.js
+++ b/rpg-docs/client/views/character/characterSettings/shareDialog.js
@@ -5,11 +5,11 @@ Template.shareDialog.onCreated(function(){
 Template.shareDialog.helpers({
 	readers: function(){
 		var char = Characters.findOne(this._id, {fields: {readers: 1}});
-		return char && char.readers;
+		return Meteor.users.find({_id: {$in: char.readers}});
 	},
 	writers: function(){
 		var char = Characters.findOne(this._id, {fields: {writers: 1}});
-		return char && char.writers;
+		return Meteor.users.find({_id: {$in: char.writers}});
 	},
 	shareButtonDisabled: function(){
 		return !Template.instance().userId.get();
@@ -18,7 +18,7 @@ Template.shareDialog.helpers({
 		if (!Template.instance().userId.get()){
 			return "User not found";
 		}
-	}
+	},
 });
 
 Template.shareDialog.events({
@@ -44,13 +44,13 @@ Template.shareDialog.events({
 		if (permission === "write"){
 			Characters.update(self._id, {
 				$addToSet: {writers: userId},
-				$pull: {readers: userId}
+				$pull: {readers: userId},
 			});
 		} else {
 			Characters.update(self._id, {
 				$addToSet: {readers: userId},
-				$pull: {writers: userId}
+				$pull: {writers: userId},
 			});
 		}
-	}
+	},
 });
diff --git a/rpg-docs/server/publications/singleCharacter.js b/rpg-docs/server/publications/singleCharacter.js
index acc6fa6f..20360a3e 100644
--- a/rpg-docs/server/publications/singleCharacter.js
+++ b/rpg-docs/server/publications/singleCharacter.js
@@ -1,14 +1,13 @@
 Meteor.publish("singleCharacter", function(characterId, userId){
-	if (
-		Characters.findOne({
-			_id: characterId,
-			$or: [
-				{readers: userId},
-				{writers: userId},
-				{owner: userId},
-			],
-		})
-	){
+	var char = Characters.findOne({
+		_id: characterId,
+		$or: [
+			{readers: userId},
+			{writers: userId},
+			{owner: userId},
+		],
+	});
+	if (char){
 		return [
 			Characters.find({_id: characterId}),
 			//get all the assets for this character including soft deleted ones
@@ -25,6 +24,10 @@ Meteor.publish("singleCharacter", function(characterId, userId){
 			SpellLists.find        ({charId: characterId}, {removed: true}),
 			TemporaryHitPoints.find({charId: characterId}, {removed: true}),
 			Proficiencies.find     ({charId: characterId}, {removed: true}),
+			Meteor.users.find      (
+				{_id: {$in: _.union(char.readers, char.writers)}},
+				{fields: {username: 1}}
+			),
 		];
 	}
 });