From 78c2fd09fefc8eb56eaa19e34e6eba4f59366a17 Mon Sep 17 00:00:00 2001
From: Sean Li <lishang106@gmail.com>
Date: Tue, 30 Sep 2014 17:14:34 -0700
Subject: [PATCH] Fixed bugs with image state syncing.

---
 meteor/client/lib/imageutil.js                            | 8 --------
 meteor/client/views/dashboard/images/dashboard-images.js  | 2 +-
 .../views/dashboard/images/dashboard-single-image.html    | 6 ++++--
 .../views/dashboard/layouts/dashboard-images-layout.html  | 4 +++-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/meteor/client/lib/imageutil.js b/meteor/client/lib/imageutil.js
index 4a279bd709..c7d5d1f718 100644
--- a/meteor/client/lib/imageutil.js
+++ b/meteor/client/lib/imageutil.js
@@ -291,16 +291,10 @@ ImageUtil.sync = function () {
           return image.docker.Id;
         }
       });
-      console.log('Doc Ids');
-      console.log(dockerIds);
       var imageIds = _.map(dockerImages, function (image) {
         return image.Id;
       });
-      console.log('Host Ids');
-      console.log(imageIds);
       var diffImages = _.difference(dockerIds, imageIds);
-      console.log('Dangling Ids');
-      console.log(diffImages);
       _.each(diffImages, function (imageId) {
         var image = Images.findOne({'docker.Id': imageId});
         if (image && image.status !== 'BUILDING') {
@@ -310,8 +304,6 @@ ImageUtil.sync = function () {
       var diffDockerImages = _.reject(dockerImages, function (image) {
         return _.contains(dockerIds, image.Id);
       });
-      console.log('To be added:');
-      console.log(diffDockerImages);
       _.each(diffDockerImages, function (image) {
         var repoTag = _.first(image.RepoTags);
         var repoTagTokens = repoTag.split(':');
diff --git a/meteor/client/views/dashboard/images/dashboard-images.js b/meteor/client/views/dashboard/images/dashboard-images.js
index 9edaddcd94..197829a68b 100755
--- a/meteor/client/views/dashboard/images/dashboard-images.js
+++ b/meteor/client/views/dashboard/images/dashboard-images.js
@@ -1,5 +1,5 @@
 Template.dashboard_images.helpers({
   images: function () {
-    return Images.find({}, {sort: {createdAt: -1}});
+    return Images.find({'meta.name': {$ne: 'kite-dns'}}, {sort: {createdAt: -1}});
   }
 });
diff --git a/meteor/client/views/dashboard/images/dashboard-single-image.html b/meteor/client/views/dashboard/images/dashboard-single-image.html
index 4040e6cdb7..b35da3a017 100755
--- a/meteor/client/views/dashboard/images/dashboard-single-image.html
+++ b/meteor/client/views/dashboard/images/dashboard-single-image.html
@@ -18,7 +18,7 @@
           {{/if}}
         {{/if}}
       {{/if}}
-      <a onclick="trackLink('image detail')" href="/images/{{_id}}" class="name">{{meta.name}}</a>
+      <a onclick="trackLink('image detail')" href="/images/{{_id}}" class="name">{{meta.name}}:{{meta.version}}</a>
       {{#if $eq status 'BUILDING'}}
         <small>Creating image. This may take a couple minutes...</small>
       {{else}}
@@ -29,7 +29,9 @@
       {{#if $eq status 'READY'}}
         <a onclick="trackLink('create app from image')" href="#" class="btn-icon btn-create-app" data-toggle="tooltip" data-placement="bottom" title="Create App"><span class="typcn typcn-plus-outline"></span></a>
       {{/if}}
-      <a onclick="trackLink('open image folder')" href="#" class="btn-icon btn-folder" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Folder"><span class="typcn typcn-folder-open"></span></a>
+      {{#if originPath}}
+        <a onclick="trackLink('open image folder')" href="#" class="btn-icon btn-folder" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Folder"><span class="typcn typcn-folder-open"></span></a>
+      {{/if}}
       {{#if $neq status 'BUILDING'}}
         <a onclick="trackLink('rebuild image')" href="#" class="btn-icon btn-rebuild" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Rebuild"><span class="typcn typcn-refresh-outline"></span></a>
       {{/if}}
diff --git a/meteor/client/views/dashboard/layouts/dashboard-images-layout.html b/meteor/client/views/dashboard/layouts/dashboard-images-layout.html
index 5200b750ba..bd12904a9e 100755
--- a/meteor/client/views/dashboard/layouts/dashboard-images-layout.html
+++ b/meteor/client/views/dashboard/layouts/dashboard-images-layout.html
@@ -14,7 +14,9 @@
                 {{#if $eq status 'READY'}}
                   <a onclick="trackLink('create app from image')" href="#" class="btn-create-app" data-toggle="tooltip" data-placement="bottom" title="Create App" data-container="body"><span class="typcn typcn-plus-outline"></span></a>
                 {{/if}}
-                <a onclick="trackLink('open image folder')" href="#" class="btn-folder" data-toggle="tooltip" data-placement="bottom" title="Folder" data-container="body"><span class="typcn typcn-folder-open"></span></a>
+                {{#if originPath}}
+                  <a onclick="trackLink('open image folder')" href="#" class="btn-folder" data-toggle="tooltip" data-placement="bottom" title="Folder" data-container="body"><span class="typcn typcn-folder-open"></span></a>
+                {{/if}}
                 {{#if $neq status 'BUILDING'}}
                   <a onclick="trackLink('rebuild image')" href="#" class="btn-rebuild" data-toggle="tooltip" data-placement="bottom" title="Rebuild" data-container="body"><span class="typcn typcn-refresh-outline"></span></a>
                 {{/if}}