hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into PHRAS-3031-trim-email-adress

Browse Source
This commit is contained in:
Nicolas Maillat
2020-04-24 13:38:51 +02:00
committed by GitHub
parent 2545d41e8d e212eb5732
commit eae612cd5e
12 changed files with 113 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Alchemy/Phrasea/Controller/Prod/FeedController.php
View File

@@ -243,8 +243,8 @@ class FeedController extends Controller
'texte' => '<p>' . $this->app->trans(
'publication::Voici votre fil RSS personnel. Il vous permettra d\'etre tenu au courrant des publications.'
) . '</p><p>' . $this->app->trans('publications::Ne le partagez pas, il est strictement confidentiel') . '</p>
<div><input type="text" readonly="readonly" class="input_select_copy" value="' . $link->getURI()
. '"/></div>',
<div class="feed_input_block"><input type="text" readonly="readonly" id="input-select-copy" class="input_select_copy" value="' . $link->getURI()
. '"/><button type="button" class="btn-info copy-feed" id="copy-feed">' . $this->app->trans('publications::copy') . '</button></div>',
'titre' => $this->app->trans('publications::votre rss personnel'),
]);
}

2
lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php
View File

@@ -69,7 +69,7 @@ class ToolsController extends Controller
continue;
}
$label = $this->app->trans('prod::tools: document');
} elseif ($databoxSubdefs->hasSubdef($subdefName)) {
} elseif ($databoxSubdefs !== null && $databoxSubdefs->hasSubdef($subdefName)) {
if (!$acl->has_access_to_subdef($record, $subdefName)) {
continue;
}