You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2018/04/23 02:26:57 UTC

lucene-solr:branch_7x: SOLR-12253: Remove optimize button from the core admin page

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_7x 78bc27c5d -> c2d01c2bc


SOLR-12253: Remove optimize button from the core admin page

(cherry picked from commit 84583d2)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c2d01c2b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c2d01c2b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c2d01c2b

Branch: refs/heads/branch_7x
Commit: c2d01c2bc75f76bf7fd3b41f93d3edb01974e5ad
Parents: 78bc27c
Author: Erick Erickson <er...@apache.org>
Authored: Sun Apr 22 19:19:09 2018 -0700
Committer: Erick Erickson <er...@apache.org>
Committed: Sun Apr 22 19:19:52 2018 -0700

----------------------------------------------------------------------
 solr/CHANGES.txt                            | 3 +++
 solr/webapp/web/css/angular/collections.css | 4 ----
 solr/webapp/web/css/angular/cores.css       | 8 --------
 solr/webapp/web/partials/cores.html         | 2 --
 4 files changed, 3 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c2d01c2b/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 23e0653..5873738 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -162,6 +162,9 @@ Bug Fixes
 
 * SOLR-12250: NegativeArraySizeException on TransactionLog if previous document more than 1.9GB (Cao Manh Dat)
 
+
+* SOLR-12253: Remove optimize button from the core admin page (Erick Erickson)
+
 Optimizations
 ----------------------
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c2d01c2b/solr/webapp/web/css/angular/collections.css
----------------------------------------------------------------------
diff --git a/solr/webapp/web/css/angular/collections.css b/solr/webapp/web/css/angular/collections.css
index 43360c0..e8d1207 100644
--- a/solr/webapp/web/css/angular/collections.css
+++ b/solr/webapp/web/css/angular/collections.css
@@ -170,10 +170,6 @@ limitations under the License.
   background-image: url( ../../img/ico/cross-button.png );
 }
 
-#content #collections .actions #optimize span
-{
-  background-image: url( ../../img/ico/hammer-screwdriver.png );
-}
 
 #content #collections .actions div.action
 {

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c2d01c2b/solr/webapp/web/css/angular/cores.css
----------------------------------------------------------------------
diff --git a/solr/webapp/web/css/angular/cores.css b/solr/webapp/web/css/angular/cores.css
index 0d10d60..0428c66 100644
--- a/solr/webapp/web/css/angular/cores.css
+++ b/solr/webapp/web/css/angular/cores.css
@@ -164,14 +164,6 @@ limitations under the License.
   background-image: url( ../../img/ico/arrow-switch.png );
 }
 
-#content #cores .actions #optimize
-{
-}
-
-#content #cores .actions #optimize span
-{
-  background-image: url( ../../img/ico/hammer-screwdriver.png );
-}
 
 #content #cores .actions div.action
 {

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c2d01c2b/solr/webapp/web/partials/cores.html
----------------------------------------------------------------------
diff --git a/solr/webapp/web/partials/cores.html b/solr/webapp/web/partials/cores.html
index e426e4c..1615769 100644
--- a/solr/webapp/web/partials/cores.html
+++ b/solr/webapp/web/partials/cores.html
@@ -29,8 +29,6 @@ limitations under the License.
       <button id="swap" class="action requires-core" ng-click="showSwapCores()"><span>Swap</span></button>
       <button id="reload" class="requires-core" ng-click="reloadCore()"
          ng-class="{success: reloadSuccess, warn: reloadFailure}"><span>Reload</span></button>
-      <button id="optimize" class="requires-core" ng-click="optimizeCore()" ng-show="core.index.hasDeletions || optimizeSuccess"
-         ng-class="{success: optimizeSuccess, warn: optimizeFailure}"><span>Optimize</span></button>
       </span>
       <div class="action add" data-rel="add" ng-show="showAdd" style="display:block;left:0px;">