diff options
| -rw-r--r-- | js/settings.admin.js | 17 | ||||
| -rw-r--r-- | lib/Controller/SettingsController.php | 4 | ||||
| -rw-r--r-- | lib/Service/ConfigService.php | 3 | ||||
| -rw-r--r-- | templates/settings.admin.php | 16 |
4 files changed, 33 insertions, 7 deletions
diff --git a/js/settings.admin.js b/js/settings.admin.js index 1f670db..ab9ef3d 100644 --- a/js/settings.admin.js +++ b/js/settings.admin.js @@ -66,6 +66,10 @@ $(document) .is(':checked')) ? 1 : 0, index_files_nextant_only : ($('#solr_index_files_nextant_only') .is(':checked')) ? 1 : 0, + index_files_trash : ($('#solr_index_files_trash') + .is(':checked')) ? 1 : 0, + index_files_trash : ($('#solr_index_files_trash') + .is(':checked')) ? 1 : 0, index_files_sharelink : ($('#solr_index_files_sharelink') .is(':checked')) ? 1 : 0, index_files_federated : ($('#solr_index_files_federated') @@ -88,6 +92,10 @@ $(document) data.index_files_nextant_only = (data.index_files_nextant_only == 1) ? 0 : 1; + if (switched == 'index_files_trash') + data.index_files_trash = (data.index_files_trash == 1) ? 0 + : 1; + if (switched == 'index_files_sharelink') data.index_files_sharelink = (data.index_files_sharelink == 1) ? 0 : 1; @@ -261,6 +269,8 @@ $(document) (response.index_files_tree == 1)); $('#solr_index_files_nextant_only').prop('checked', (response.index_files_nextant_only == 1)); + $('#solr_index_files_trash').prop('checked', + (response.index_files_trash == 1)); $('#solr_index_files_sharelink').prop('checked', (response.index_files_sharelink == 1)); $('#solr_index_files_federated').prop('checked', @@ -648,6 +658,13 @@ $(document) .savesuboptions_files('index_files_nextant_only'); }); + $('#solr_index_files_trash') + .mousedown( + function() { + nextantSettings + .savesuboptions_files('index_files_trash'); + }); + $('#solr_index_files_sharelink') .mousedown( function() { diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php index 1227b25..f80d048 100644 --- a/lib/Controller/SettingsController.php +++ b/lib/Controller/SettingsController.php @@ -102,6 +102,7 @@ class SettingsController extends Controller 'index_files_max_size' => $this->configService->getAppValue('index_files_max_size'), 'index_files_tree' => $this->configService->getAppValue('index_files_tree'), 'index_files_nextant_only' => $this->configService->getAppValue('index_files_nextant_only'), + 'index_files_trash' => $this->configService->getAppValue('index_files_trash'), 'index_files_sharelink' => $this->configService->getAppValue('index_files_sharelink'), 'index_files_federated' => $this->configService->getAppValue('index_files_federated'), 'index_files_external' => $this->configService->getAppValue('index_files_external'), @@ -136,11 +137,12 @@ class SettingsController extends Controller return $response; } - public function setOptionsFiles($index_files, $index_files_max_size, $index_files_tree, $index_files_nextant_only, $index_files_sharelink, $index_files_federated, $index_files_external, $index_files_encrypted, $index_files_filters) + public function setOptionsFiles($index_files, $index_files_max_size, $index_files_tree, $index_files_nextant_only, $index_files_trash, $index_files_sharelink, $index_files_federated, $index_files_external, $index_files_encrypted, $index_files_filters) { $this->configService->setAppValue('index_files', $index_files); $this->configService->setAppValue('index_files_tree', $index_files_tree); $this->configService->setAppValue('index_files_nextant_only', $index_files_nextant_only); + $this->configService->setAppValue('index_files_trash', $index_files_trash); $this->configService->setAppValue('index_files_sharelink', $index_files_sharelink); $this->configService->setAppValue('index_files_federated', $index_files_federated); $this->configService->setAppValue('index_files_external', $index_files_external); diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php index 4e1492e..9049088 100644 --- a/lib/Service/ConfigService.php +++ b/lib/Service/ConfigService.php @@ -68,7 +68,8 @@ class ConfigService 'index_files_update_needed' => '1', 'index_files_tree' => '0', 'index_files_nextant_only' => '0', - 'undex_files_sharelink' => '0', + 'index_files_trash' => '1', + 'index_files_sharelink' => '0', 'index_files_federated' => '0', 'index_files_external' => '0', 'index_files_encrypted' => '0', diff --git a/templates/settings.admin.php b/templates/settings.admin.php index fb60e56..8c666da 100644 --- a/templates/settings.admin.php +++ b/templates/settings.admin.php @@ -121,6 +121,14 @@ style('nextant', 'admin'); <tr style="height: 30px;"> <td class="nextant_admin_left"> + <?php p($l->t('Index File Trash:')) ?></td> + <td colspan="2"><input type="checkbox" + name="solr_index_files_trash" id="solr_index_files_trash" + value="1" style="margin: 10px;"></td> + </tr> + + <tr style="height: 30px;"> + <td class="nextant_admin_left"> <?php p($l->t('Index Public Links :')) ?></td> <td colspan="2"><input type="checkbox" name="solr_index_files_sharelink" @@ -224,12 +232,10 @@ style('nextant', 'admin'); </td> <td colspan="2"><select id="solr_index_live" style="width: 200px"> <option value="0"><?php p($l->t('Disabled')); ?></option> - <!-- <option value="1"><?php p($l->t('Using Semaphore')); ?></option> --> + <!-- <option value="1"><?php p($l->t('Using Semaphore')); ?></option> --> <option value="2"><?php p($l->t('Using Database')); ?></option> - </select> -<!-- <input type="text" id="solr_index_live_queuekey" - style="width: 100px; font-size: 12px;" /> --> - </td> + </select> <!-- <input type="text" id="solr_index_live_queuekey" + style="width: 100px; font-size: 12px;" /> --></td> </tr> <tr style="height: 30px;"> |