diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2022-08-18 12:10:55 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-08-18 12:10:55 +0200 |
| commit | 1603c10bbab61b4a84380c8a9d5aa77536a4f1c7 (patch) | |
| tree | 36ee76291c8e877d7421641ae7a38570ff65f8ce /app/views | |
| parent | 4f111c5b305078a641d13ac41ce7d798e3cc19ce (diff) | |
XPath ability to define the UID manually (#4507)
* XPath ability to define the UID manually
* Fix error in i18n
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/helpers/export/opml.phtml | 1 | ||||
| -rw-r--r-- | app/views/helpers/feed/update.phtml | 8 | ||||
| -rw-r--r-- | app/views/subscription/add.phtml | 7 |
3 files changed, 16 insertions, 0 deletions
diff --git a/app/views/helpers/export/opml.phtml b/app/views/helpers/export/opml.phtml index c401b05bd..677bb03b5 100644 --- a/app/views/helpers/export/opml.phtml +++ b/app/views/helpers/export/opml.phtml @@ -28,6 +28,7 @@ function feedsToOutlines($feeds, $excludeMutedFeeds = false): array { $outline['frss:xPathItemTimestamp'] = ['namespace' => FreshRSS_Export_Service::FRSS_NAMESPACE, 'value' => $xPathSettings['itemTimestamp'] ?? null]; $outline['frss:xPathItemThumbnail'] = ['namespace' => FreshRSS_Export_Service::FRSS_NAMESPACE, 'value' => $xPathSettings['itemThumbnail'] ?? null]; $outline['frss:xPathItemCategories'] = ['namespace' => FreshRSS_Export_Service::FRSS_NAMESPACE, 'value' => $xPathSettings['itemCategories'] ?? null]; + $outline['frss:xPathItemUid'] = ['namespace' => FreshRSS_Export_Service::FRSS_NAMESPACE, 'value' => $xPathSettings['itemUid'] ?? null]; } if (!empty($feed->filtersAction('read'))) { $filters = ''; diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml index 0e4a34a76..02dcb29e6 100644 --- a/app/views/helpers/feed/update.phtml +++ b/app/views/helpers/feed/update.phtml @@ -475,6 +475,14 @@ data-leave-validation="<?= $xpath['itemCategories'] ?? '' ?>"><?= $xpath['itemCategories'] ?? '' ?></textarea> </div> </div> + <div class="form-group"> + <label class="group-name" for="xPathItemUid"><small><?= _t('sub.feed.kind.html_xpath.relative') ?></small><br /> + <?= _t('sub.feed.kind.html_xpath.item_uid') ?></label> + <div class="group-controls"> + <textarea class="valid-xpath w100" name="xPathItemUid" id="xPathItemUid" rows="2" cols="64" spellcheck="false" + data-leave-validation="<?= $xpath['itemUid'] ?? '' ?>"><?= $xpath['itemUid'] ?? '' ?></textarea> + </div> + </div> </fieldset> <div class="form-group form-actions"> <div class="group-controls"> diff --git a/app/views/subscription/add.phtml b/app/views/subscription/add.phtml index 5aadc350b..41ee04fb7 100644 --- a/app/views/subscription/add.phtml +++ b/app/views/subscription/add.phtml @@ -147,6 +147,13 @@ <textarea class="valid-xpath" name="xPathItemCategories" id="xPathItemCategories" rows="2" cols="64" spellcheck="false"></textarea> </div> </div> + <div class="form-group"> + <label class="group-name" for="xPathItemUid"><small><?= _t('sub.feed.kind.html_xpath.relative') ?></small><br /> + <?= _t('sub.feed.kind.html_xpath.item_uid') ?></label> + <div class="group-controls"> + <textarea class="valid-xpath" name="xPathItemUid" id="xPathItemUid" rows="2" cols="64" spellcheck="false"></textarea> + </div> + </div> </fieldset> </details> |