diff options
| -rw-r--r-- | js/settings.admin.js | 8 | ||||
| -rw-r--r-- | lib/Controller/SettingsController.php | 7 | ||||
| -rw-r--r-- | lib/Service/ConfigService.php | 7 | ||||
| -rw-r--r-- | templates/settings.admin.php | 12 |
4 files changed, 16 insertions, 18 deletions
diff --git a/js/settings.admin.js b/js/settings.admin.js index d47295c..10c332c 100644 --- a/js/settings.admin.js +++ b/js/settings.admin.js @@ -129,11 +129,11 @@ $(document) 'checked', (response.index_files_external_index == 1)); - if (response.index_files_last > 0) - $('#solr_index_files_last').text( - response.index_files_last_format); + if (response.index_last > 0) + $('#solr_index_last').text( + response.index_last_format); else - $('#solr_index_files_last').text('never'); + $('#solr_index_last').text('never'); $('#solr_index_files_max_size').val( response.index_files_max_size); diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php index 382de75..6570009 100644 --- a/lib/Controller/SettingsController.php +++ b/lib/Controller/SettingsController.php @@ -86,8 +86,6 @@ class SettingsController extends Controller 'solr_url' => $this->configService->getAppValue('solr_url'), 'solr_core' => $this->configService->getAppValue('solr_core'), 'nextant_version' => $this->configService->getAppValue('installed_version') . ' (beta)', - 'index_files_last' => $this->configService->getAppValue('index_files_last'), - 'index_files_last_format' => date('r', $this->configService->getAppValue('index_files_last')), 'index_files_needed' => $this->configService->getAppValue('index_files_needed'), 'index_files_max_size' => $this->configService->getAppValue('index_files_max_size'), 'index_files_live_extract' => $this->configService->getAppValue('index_files_live_extract'), @@ -98,9 +96,10 @@ class SettingsController extends Controller 'bookmarks_app_enabled' => (\OCP\App::isEnabled('bookmarks')), 'index_bookmarks' => $this->configService->getAppValue('index_bookmarks'), 'index_bookmarks_needed' => $this->configService->getAppValue('index_bookmarks_needed'), - 'index_bookmarks_last' => $this->configService->getAppValue('index_bookmarks_last'), 'index_bookmarks_last_format' => date('r', $this->configService->getAppValue('index_bookmarks_last')), - 'index_locked' => $this->configService->getAppValue('index_locked') + 'index_locked' => $this->configService->getAppValue('index_locked'), + 'index_last' => $this->configService->getAppValue('index_last'), + 'index_last_format' => date('r', $this->configService->getAppValue('index_last')) ); return $response; diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php index 4b4773a..f64458c 100644 --- a/lib/Service/ConfigService.php +++ b/lib/Service/ConfigService.php @@ -46,18 +46,17 @@ class ConfigService 'display_result' => 1, 'index_locked' => 0, + 'index_last' => 0, 'index_files' => 1, 'index_files_needed' => 1, 'index_files_update_needed' => 1, - 'index_files_last' => 0, 'index_files_live_extract' => 1, 'index_files_live_update' => 0, 'index_files_max_size' => 40, 'index_bookmarks' => 0, - 'index_bookmarks_needed' => 1, - 'index_bookmarks_last' => 0 + 'index_bookmarks_needed' => 1 ]; private $appName; @@ -84,7 +83,7 @@ class ConfigService { $this->setAppValue('index_locked', $this->getAppValue('solr_lock')); $this->setAppValue('index_files_needed', $this->getAppValue('needed_index')); - $this->setAppValue('index_files_last', $this->getAppValue('last_index')); + $this->setAppValue('index_last', $this->getAppValue('last_index')); $this->setAppValue('index_files_live_extract', $this->getAppValue('live_extract')); $this->setAppValue('index_files_live_update', $this->getAppValue('live_docupdate')); $this->setAppValue('index_files_max_size', $this->getAppValue('max_size')); diff --git a/templates/settings.admin.php b/templates/settings.admin.php index f28ef90..7e8b39c 100644 --- a/templates/settings.admin.php +++ b/templates/settings.admin.php @@ -104,12 +104,6 @@ style('nextant', 'admin'); <td><input type="checkbox" name="solr_index_files_live_update" id="solr_index_files_live_update" value="1" style="margin: 10px;"></td> </tr> - <tr style="height: 30px;"> - <td class="nextant_admin_left"> - <?php p($l->t('Last index :')) ?></td> - <td><div id="solr_index_files_last"></div></td> - - </tr> <!-- @@ -170,6 +164,12 @@ style('nextant', 'admin'); <?php p($l->t('Number of documents :')) ?></td> <td><div id="solr_current_docs"></div></td> </tr> + <tr style="height: 30px;"> + <td class="nextant_admin_left"> + <?php p($l->t('Last index :')) ?></td> + <td><div id="solr_index_last"></div></td> + + </tr> <tr> <td> </td> |