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/02 12:18:28 UTC
svn commit: r1392823 - in /lucene/dev/branches/lucene_solr_4_0: ./
dev-tools/ lucene/ lucene/analysis/
lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards/
lucene/benchmark/ lucene/codecs/ lucene/core/ lucene/core/src/test/org/ap...
Author: steffkes
Date: Tue Oct 2 10:18:25 2012
New Revision: 1392823
URL: http://svn.apache.org/viewvc?rev=1392823&view=rev
Log:
SOLR-3637: Commit Status at Core-Admin UI is always false (merge r1392327)
Modified:
lucene/dev/branches/lucene_solr_4_0/ (props changed)
lucene/dev/branches/lucene_solr_4_0/dev-tools/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/BUILD.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/CHANGES.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/JRE_VERSION_MIGRATION.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/LICENSE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/MIGRATE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/README.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/analysis/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/backwards/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/benchmark/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/build.xml (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/codecs/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/common-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/core/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/index.40.cfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/index.40.nocfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/demo/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/facet/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/grouping/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/highlighter/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/ivy-settings.xml (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/join/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/licenses/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/memory/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/misc/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/module-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/queries/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/queryparser/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/sandbox/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/site/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/spatial/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/suggest/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/tools/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/CHANGES.txt
lucene/dev/branches/lucene_solr_4_0/solr/LICENSE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/README.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/build.xml (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/cloud-dev/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/common-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/contrib/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/example/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpclient-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpclient-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpcore-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpcore-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpmime-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpmime-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/scripts/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/site/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/solrj/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/test-framework/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/testlogging.properties (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/webapp/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/webapp/web/js/scripts/cores.js
lucene/dev/branches/lucene_solr_4_0/solr/webapp/web/tpl/cores.html
Modified: lucene/dev/branches/lucene_solr_4_0/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/solr/CHANGES.txt?rev=1392823&r1=1392822&r2=1392823&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_0/solr/CHANGES.txt Tue Oct 2 10:18:25 2012
@@ -347,6 +347,8 @@ Bug Fixes
* SOLR-3883: Distributed indexing forwards non-applicable request params.
(Dan Sutton, Per Steffensen, yonik, Mark Miller)
+* SOLR-3637: Commit Status at Core-Admin UI is always false (steffkes)
+
Other Changes
----------------------
Modified: lucene/dev/branches/lucene_solr_4_0/solr/webapp/web/js/scripts/cores.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/solr/webapp/web/js/scripts/cores.js?rev=1392823&r1=1392822&r2=1392823&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/solr/webapp/web/js/scripts/cores.js (original)
+++ lucene/dev/branches/lucene_solr_4_0/solr/webapp/web/js/scripts/cores.js Tue Oct 2 10:18:25 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
(
Modified: lucene/dev/branches/lucene_solr_4_0/solr/webapp/web/tpl/cores.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/solr/webapp/web/tpl/cores.html?rev=1392823&r1=1392822&r2=1392823&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/solr/webapp/web/tpl/cores.html (original)
+++ lucene/dev/branches/lucene_solr_4_0/solr/webapp/web/tpl/cores.html Tue Oct 2 10:18:25 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>