You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by st...@apache.org on 2013/01/05 11:51:37 UTC
svn commit: r1429255 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/webapp/ solr/webapp/web/css/styles/cloud.css
solr/webapp/web/js/require.js solr/webapp/web/js/scripts/cloud.js
Author: steffkes
Date: Sat Jan 5 10:51:37 2013
New Revision: 1429255
URL: http://svn.apache.org/viewvc?rev=1429255&view=rev
Log:
SOLR-4264: Missing Error-Screen on UI's Cloud-Page (merge r1429254)
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/webapp/ (props changed)
lucene/dev/branches/branch_4x/solr/webapp/web/css/styles/cloud.css
lucene/dev/branches/branch_4x/solr/webapp/web/js/require.js
lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cloud.js
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1429255&r1=1429254&r2=1429255&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Sat Jan 5 10:51:37 2013
@@ -198,6 +198,8 @@ Optimizations
* SOLR-4262: Replication Icon on Dashboard does not reflect Master-/Slave-
State (steffkes)
+* SOLR-4264: Missing Error-Screen on UI's Cloud-Page (steffkes)
+
Bug Fixes
----------------------
Modified: lucene/dev/branches/branch_4x/solr/webapp/web/css/styles/cloud.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/web/css/styles/cloud.css?rev=1429255&r1=1429254&r2=1429255&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/webapp/web/css/styles/cloud.css (original)
+++ lucene/dev/branches/branch_4x/solr/webapp/web/css/styles/cloud.css Sat Jan 5 10:51:37 2013
@@ -18,7 +18,7 @@
{
background-color: #f00;
background-image: url( ../../img/ico/construction.png );
- background-position: 10px 50%;
+ background-position: 10px 12px;
color: #fff;
font-weight: bold;
margin-bottom: 20px;
@@ -26,6 +26,13 @@
padding-left: 35px;
}
+#content #cloud #error .msg
+{
+ font-style: italic;
+ font-weight: normal;
+ margin-top: 10px;
+}
+
#content #cloud #debug
{
background-color: #fff;
Modified: lucene/dev/branches/branch_4x/solr/webapp/web/js/require.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/web/js/require.js?rev=1429255&r1=1429254&r2=1429255&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/webapp/web/js/require.js (original)
+++ lucene/dev/branches/branch_4x/solr/webapp/web/js/require.js Sat Jan 5 10:51:37 2013
@@ -9359,7 +9359,9 @@ jQuery.extend({
}
done( 0, statusText );
return this;
- }
+ },
+
+ url : s.url
};
// Callback for when everything is done
Modified: lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cloud.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cloud.js?rev=1429255&r1=1429254&r2=1429255&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cloud.js (original)
+++ lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cloud.js Sat Jan 5 10:51:37 2013
@@ -15,6 +15,27 @@
limitations under the License.
*/
+var zk_error = function zk_error( xhr, text_status, error_thrown )
+{
+ var zk = null;
+ try
+ {
+ eval( 'zk = ' + xhr.responseText + ';' );
+ }
+ catch( e ) {}
+
+ var message = '<p class="txt">Loading of "<code>' + xhr.url + '</code>" '
+ + 'failed (HTTP-Status <code>' + xhr.status + '</code>)</p>' + "\n";
+
+ if( zk.error )
+ {
+ message += '<p class="msg">"' + zk.error.esc() + '"</p>' + "\n";
+ }
+
+ this.closest( '#cloud' )
+ .html( '<div class="block" id="error">' + message + '</div>' );
+};
+
var init_debug = function( cloud_element )
{
var debug_element = $( '#debug', cloud_element );
@@ -633,19 +654,7 @@ var init_tree = function( tree_element )
}
);
},
- error : function( xhr, text_status, error_thrown )
- {
- var message = 'Loading of <code>' + app.config.zookeeper_path + '</code> failed with "' + text_status + '" '
- + '(<code>' + error_thrown.message + '</code>)';
-
- if( 200 !== xhr.status )
- {
- message = 'Loading of <code>' + app.config.zookeeper_path + '</code> failed with HTTP-Status ' + xhr.status + ' ';
- }
-
- this
- .html( '<div class="block" id="error">' + message + '</div>' );
- },
+ error : zk_error,
complete : function( xhr, text_status )
{
}
@@ -710,8 +719,20 @@ sammy.get
}
);
- $( 'a[href="' + context.path + '"]', navigation_element )
- .trigger( 'activate' );
+ $.ajax
+ (
+ {
+ url : app.config.solr_path + '/zookeeper?wt=json',
+ dataType : 'json',
+ context : cloud_element,
+ success : function( response, text_status, xhr )
+ {
+ $( 'a[href="' + context.path + '"]', navigation_element )
+ .trigger( 'activate' );
+ },
+ error : zk_error
+ }
+ );
}
);