svn commit: r1343664 - in /felix/trunk/webconsole-plugins/obr/src/main/resources/res: plugin.html plugin.js

[vv...@apache.org]

Author: vvalchev
Date: Tue May 29 10:59:38 2012
New Revision: 1343664

URL: http://svn.apache.org/viewvc?rev=1343664&view=rev
Log:
Fixed FELIX-3503 The obr page in the webconsole does not update on refresh
https://issues.apache.org/jira/browse/FELIX-3503

Modified:
    felix/trunk/webconsole-plugins/obr/src/main/resources/res/plugin.html
    felix/trunk/webconsole-plugins/obr/src/main/resources/res/plugin.js

Modified: felix/trunk/webconsole-plugins/obr/src/main/resources/res/plugin.html
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/obr/src/main/resources/res/plugin.html?rev=1343664&r1=1343663&r2=1343664&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/obr/src/main/resources/res/plugin.html (original)
+++ felix/trunk/webconsole-plugins/obr/src/main/resources/res/plugin.html Tue May 29 10:59:38 2012
@@ -1,5 +1,6 @@
 <script type="text/javascript" src="${pluginRoot}/res/plugin.js"></script>
 <script type="text/javascript">
+// <![CDATA[
 var i18n = {
 	status_ok : '${obr.status.ok}',
 	status_no : '${obr.status.no}',
@@ -7,6 +8,7 @@ var i18n = {
 	error : '${obr.error}'
 }
 var obrData = ${__data__};
+// ]]>
 </script>
 
 <p class="statline">${obr.status.ok}</p>
@@ -74,7 +76,7 @@ var obrData = ${__data__};
         <a href="${pluginRoot}?list=x">X</a>
         <a href="${pluginRoot}?list=y">Y</a>
         <a href="${pluginRoot}?list=z">Z</a>
-        <a href="${pluginRoot}?list=-">?</a>
+        <a href="${pluginRoot}">?</a>
     </span>
     <input type="text" id="searchField" title="${obr.action.search.description}"/>
     <button id="searchBtn">${obr.action.search}</button>

Modified: felix/trunk/webconsole-plugins/obr/src/main/resources/res/plugin.js
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/obr/src/main/resources/res/plugin.js?rev=1343664&r1=1343663&r2=1343664&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/obr/src/main/resources/res/plugin.js (original)
+++ felix/trunk/webconsole-plugins/obr/src/main/resources/res/plugin.js Tue May 29 10:59:38 2012
@@ -419,9 +419,10 @@ function renderRepository(repo) {
     repoTable.append(_tr);
 }
 
-function renderData() {
+function renderData(data) {
     repoTable.empty();
     resTable.empty();
+	$.extend ( obrData, data );
     if ( obrData.status ) {
         $('.statline').html(i18n.status_ok);
         ifStatusOK.removeClass('ui-helper-hidden');