From ccf25a67d99962fbb39eb48d5c67911928e4b051 Mon Sep 17 00:00:00 2001
From: Mike Hatfield <mike.hatfield@alfresco.com>
Date: Mon, 9 Jul 2007 20:35:19 +0000
Subject: [PATCH] Word Add-in web scripts - fixed for AWC-1337, exception when
 no results returned from search. Also removed unnecessary server-side
 javascript files.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6205 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org/alfresco/office/documentDetails.get.js       |  0
 .../webscripts/org/alfresco/office/myAlfresco.get.js |  0
 .../webscripts/org/alfresco/office/search.get.js     |  0
 .../org/alfresco/office/searchResults.get.html.ftl   |  5 +++--
 .../org/alfresco/office/searchResults.get.js         |  0
 source/web/scripts/office/search.js                  | 12 +++++++++---
 6 files changed, 12 insertions(+), 5 deletions(-)
 delete mode 100644 config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.js
 delete mode 100644 config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.js
 delete mode 100644 config/alfresco/templates/webscripts/org/alfresco/office/search.get.js
 delete mode 100644 config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.js

diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.js b/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.js b/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/search.get.js b/config/alfresco/templates/webscripts/org/alfresco/office/search.get.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl
index da55622c17..734a2611f0 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl
@@ -16,10 +16,11 @@
       <#assign maxresults=10>
    </#if>
    <#assign resCount=0>
+   <#assign totalResults=0>
    <#assign results = companyhome.childrenByLuceneSearch[queryString] >
    <#if results?size = 0>
-   <div>
-      <span class="noItems">(No results found)</span>
+   <div class="noItems">
+      <span>(No results found)</span>
    </div>
    <#else>
       <#assign totalResults = results?size>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.js b/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/source/web/scripts/office/search.js b/source/web/scripts/office/search.js
index e5b041c2e2..499f809171 100644
--- a/source/web/scripts/office/search.js
+++ b/source/web/scripts/office/search.js
@@ -20,14 +20,20 @@ var OfficeSearch =
    
    itemsFound: function(shownResults, totalResults)
    {
-      if (shownResults < totalResults)
+      var strFound;
+      if (totalResults == 0)
       {
-         $('itemsFound').innerHTML = "Showing first " + shownResults + " of " + totalResults + " total items found";
+         strFound = "No items found";
+      }
+      else if (shownResults < totalResults)
+      {
+         strFound = "Showing first " + shownResults + " of " + totalResults + " total items found";
       }
       else
       {
-         $('itemsFound').innerHTML = "Showing all " + shownResults + " items found";
+         strFound = "Showing all " + shownResults + " items found";
       }
+      $('itemsFound').innerHTML = strFound;
    },
 
    /* AJAX call to perform server-side search */