2 files changed, 32 insertions, 3 deletions
diff --git a/public/assets/js/lib/views/details/settings.js b/public/assets/js/lib/views/details/settings.js
index b702908..1124826 100644
--- a/public/assets/js/lib/views/details/settings.js
+++ b/public/assets/js/lib/views/details/settings.js
@@ -16,6 +16,7 @@ var ThreadSettingsForm = FormView.extend({
   initialize: function(){
     this.__super__.initialize.call(this)
     this.template = this.$(".template").html()
+    this.allowedTemplate = this.$(".allowedTemplate").html()
   },
   
   populate: function(){
@@ -47,6 +48,13 @@ var ThreadSettingsForm = FormView.extend({
     })
     $color.val(thread.color || keyword ? keyword.color : "")
     
+    this.fetchKeywords()
+//     this.fetchAllowedUsers(thread)
+
+    $("body").removeClass("loading")
+  },
+  
+  fetchKeywords: function(){
     $.get('/api/keywords', function(data){
       var $keyword = this.$('[name=keyword]')
       data.keywords
@@ -60,10 +68,31 @@ var ThreadSettingsForm = FormView.extend({
       })
       $keyword.val(thread.keyword)
     }.bind(this))
-
-    $("body").removeClass("loading")
   },
   
+//   fetchAllowedUsers: function(thread){
+//     var usernameRegexp = new RegExp('{{username}}', g)
+//     $.get('/api/thread/' + thread.id + '/interested', function(data){
+//       var $allowed = this.$(".allowed")
+//       var tmpl = this.allowedTemplate
+//       // make a lookup of existing users 
+//       var allowed = {}
+//       thread.allowed.split(" ").forEach((username) => {
+//         
+//       })
+//       // build the ui
+//       data.interestedUsers
+//       .map( (a) => a.username)
+//       .sort( (a,b) => a < b ? -1 : a === b ? 0 : 1 )
+//       .forEach((username) => {
+//         var t = tmpl.replace(usernameRegexp, "")
+//           .replace('{{checked}}', 
+//         $keyword.append(option)
+//       })
+//       $keyword.val(thread.keyword)
+//     }.bind(this))
+//   },
+    
   validate: function(){
     var errors = []
     var title = $("[name=title]").val()
diff --git a/public/assets/js/util/format.js b/public/assets/js/util/format.js
index c86bec3..339e4f6 100644
--- a/public/assets/js/util/format.js
+++ b/public/assets/js/util/format.js
@@ -170,7 +170,7 @@ function get_age (t) {
   if (age < 60) { return r(age) + "m" }
   m = r(age % 60)
   age /= 60
-  if (m > 0 && age < 2) { return m + "m" + r(age) + "h" }
+  if (m > 0 && age < 2) { return r(age) + "h" + m + "m" }
   if (age < 24) { return r(age) + "h" }
   age /= 24
   if (age < 7) { return r(age) + "d" }