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 2012/10/01 15:57:11 UTC

svn commit: r1392335 - in /lucene/dev/branches/branch_4x/solr: CHANGES.txt webapp/web/js/scripts/cores.js webapp/web/tpl/cores.html

Author: steffkes
Date: Mon Oct  1 13:57:11 2012
New Revision: 1392335

URL: http://svn.apache.org/viewvc?rev=1392335&view=rev
Log:
SOLR-3637: Commit Status at Core-Admin UI is always false (merge r1392327)

Modified:
    lucene/dev/branches/branch_4x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cores.js
    lucene/dev/branches/branch_4x/solr/webapp/web/tpl/cores.html

Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1392335&r1=1392334&r2=1392335&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Oct  1 13:57:11 2012
@@ -56,6 +56,8 @@ Bug Fixes
 * SOLR-3560: Handle different types of Exception Messages for Logging UI
   (steffkes)
 
+* SOLR-3637: Commit Status at Core-Admin UI is always false (steffkes)
+
 Other Changes
 ----------------------
 

Modified: lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cores.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cores.js?rev=1392335&r1=1392334&r2=1392335&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cores.js (original)
+++ lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cores.js Mon Oct  1 13:57:11 2012
@@ -201,13 +201,13 @@ sammy.get
                   .html( core_data.index.maxDoc );
 
                 $( '.optimized dd', index_data_element )
-                  .addClass( core_data.index.optimized ? 'ico-1' : 'ico-0' );
+                  .addClass( !core_data.index.hasDeletions ? 'ico-1' : 'ico-0' );
 
                 $( '#actions #optimize', cores_element )
                   .show();
 
                 $( '.optimized dd span', index_data_element )
-                  .html( core_data.index.optimized ? 'yes' : 'no' );
+                  .html( !core_data.index.hasDeletions ? 'yes' : 'no' );
 
                 $( '.current dd', index_data_element )
                   .addClass( core_data.index.current ? 'ico-1' : 'ico-0' );
@@ -215,12 +215,6 @@ sammy.get
                 $( '.current dd span', index_data_element )
                   .html( core_data.index.current ? 'yes' : 'no' );
 
-                $( '.hasDeletions dd', index_data_element )
-                  .addClass( core_data.index.hasDeletions ? 'ico-1' : 'ico-0' );
-
-                $( '.hasDeletions dd span', index_data_element )
-                  .html( core_data.index.hasDeletions ? 'yes' : 'no' );
-
                 $( '.directory dd', index_data_element )
                   .html
                   (
@@ -326,12 +320,6 @@ sammy.get
 
                 var form_callback = {
 
-                  create : function( form, response )
-                  {
-                    var url = path_parts[1] + response.core;
-                    context.redirect( url );
-                  },
-
                   rename : function( form, response )
                   {
                     var url = path_parts[1] + $( 'input[name="other"]', form ).val();

Modified: lucene/dev/branches/branch_4x/solr/webapp/web/tpl/cores.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/web/tpl/cores.html?rev=1392335&r1=1392334&r2=1392335&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/webapp/web/tpl/cores.html (original)
+++ lucene/dev/branches/branch_4x/solr/webapp/web/tpl/cores.html Mon Oct  1 13:57:11 2012
@@ -194,11 +194,6 @@ limitations under the License.
                 <dd class="ico"><span></span></dd>
             </dl></li>
 
-            <li class="hasDeletions"><dl class="clearfix">
-              <dt><span>hasDeletions:</span></dt>
-                <dd class="ico"><span></span></dd>
-            </dl></li>
-
             <li class="directory"><dl class="clearfix">
               <dt><span>directory:</span></dt>
                 <dd></dd>