Skip to content
Snippets Groups Projects
Commit 37f0f271 authored by Dorian Merz's avatar Dorian Merz
Browse files

Merge branch 'instance/fid' into instance/fid_bbi

parents 141c8e70 a7b11bee
Branches
Tags
No related merge requests found
...@@ -171,6 +171,7 @@ class GetIt extends AbstractHelper ...@@ -171,6 +171,7 @@ class GetIt extends AbstractHelper
$showLinks = true; $showLinks = true;
$showOrderButton = false; $showOrderButton = false;
$showPartCopyButton = false; $showPartCopyButton = false;
$showArticleButton = false;
$bossData = false; $bossData = false;
$isEBCEBooks = false; $isEBCEBooks = false;
$hideNotice = false; $hideNotice = false;
...@@ -189,6 +190,7 @@ class GetIt extends AbstractHelper ...@@ -189,6 +190,7 @@ class GetIt extends AbstractHelper
$showLinks, $showLinks,
$showOrderButton, $showOrderButton,
$showPartCopyButton, $showPartCopyButton,
$showArticleButton,
$bossData, $bossData,
$isEBCEBooks, $isEBCEBooks,
$hideNotice, $hideNotice,
...@@ -210,6 +212,7 @@ class GetIt extends AbstractHelper ...@@ -210,6 +212,7 @@ class GetIt extends AbstractHelper
'showLinks', 'showLinks',
'showOrderButton', 'showOrderButton',
'showPartCopyButton', 'showPartCopyButton',
'showArticleButton',
'bossData', 'bossData',
'isEBCEBooks', 'isEBCEBooks',
'hideNotice', 'hideNotice',
...@@ -227,6 +230,7 @@ class GetIt extends AbstractHelper ...@@ -227,6 +230,7 @@ class GetIt extends AbstractHelper
* @param $showLinks boolean display links * @param $showLinks boolean display links
* @param $showOrderButton boolean display order button * @param $showOrderButton boolean display order button
* @param $showPartCopyButton boolean display part copy button * @param $showPartCopyButton boolean display part copy button
* @param $showArticleButton boolean display part copy button
* @param $bossData boolean display data of BOSS webservice * @param $bossData boolean display data of BOSS webservice
* @param $isEBCEBooks boolean is given record UBL-FID-EBC * @param $isEBCEBooks boolean is given record UBL-FID-EBC
* @param $hideNotice boolean hide notice * @param $hideNotice boolean hide notice
...@@ -240,6 +244,7 @@ class GetIt extends AbstractHelper ...@@ -240,6 +244,7 @@ class GetIt extends AbstractHelper
&$showLinks, &$showLinks,
&$showOrderButton, &$showOrderButton,
&$showPartCopyButton, &$showPartCopyButton,
&$showArticleButton,
&$bossData, &$bossData,
&$isEBCEBooks, &$isEBCEBooks,
&$hideNotice, &$hideNotice,
...@@ -261,6 +266,7 @@ class GetIt extends AbstractHelper ...@@ -261,6 +266,7 @@ class GetIt extends AbstractHelper
* @param $showLinks boolean display links * @param $showLinks boolean display links
* @param $showOrderButton boolean display order button * @param $showOrderButton boolean display order button
* @param $showPartCopyButton boolean display part copy button * @param $showPartCopyButton boolean display part copy button
* @param $showArticleButton boolean display part copy button
* @param $bossData boolean display data of BOSS webservice * @param $bossData boolean display data of BOSS webservice
* @param $isEBCEBooks boolean is given record UBL-FID-EBC * @param $isEBCEBooks boolean is given record UBL-FID-EBC
* @param $hideNotice boolean hide notice * @param $hideNotice boolean hide notice
...@@ -274,6 +280,7 @@ class GetIt extends AbstractHelper ...@@ -274,6 +280,7 @@ class GetIt extends AbstractHelper
&$showLinks, &$showLinks,
&$showOrderButton, &$showOrderButton,
&$showPartCopyButton, &$showPartCopyButton,
&$showArticleButton,
&$bossData, &$bossData,
&$isEBCEBooks, &$isEBCEBooks,
&$hideNotice, &$hideNotice,
...@@ -285,6 +292,8 @@ class GetIt extends AbstractHelper ...@@ -285,6 +292,8 @@ class GetIt extends AbstractHelper
$boxHeadline = $this->fidClient->isLoggedOn() ? $this->translate('Get it') : $this->translate('getit_logged_not'); $boxHeadline = $this->fidClient->isLoggedOn() ? $this->translate('Get it') : $this->translate('getit_logged_not');
$notice = ''; $notice = '';
$isAiSidRecord = true; $isAiSidRecord = true;
$showArticleButton = isset($this->config->Permission->allowSubitoArticleCopy) ?
$this->config->Permission->allowSubitoArticleCopy : true;
} }
/** /**
...@@ -297,6 +306,7 @@ class GetIt extends AbstractHelper ...@@ -297,6 +306,7 @@ class GetIt extends AbstractHelper
* @param $showLinks boolean display links * @param $showLinks boolean display links
* @param $showOrderButton boolean display order button * @param $showOrderButton boolean display order button
* @param $showPartCopyButton boolean display part copy button * @param $showPartCopyButton boolean display part copy button
* @param $showArticleButton boolean display part copy button
* @param $bossData boolean display data of BOSS webservice * @param $bossData boolean display data of BOSS webservice
* @param $isEBCEBooks boolean is given record UBL-FID-EBC * @param $isEBCEBooks boolean is given record UBL-FID-EBC
* @param $hideNotice boolean hide notice * @param $hideNotice boolean hide notice
...@@ -310,6 +320,7 @@ class GetIt extends AbstractHelper ...@@ -310,6 +320,7 @@ class GetIt extends AbstractHelper
&$showLinks, &$showLinks,
&$showOrderButton, &$showOrderButton,
&$showPartCopyButton, &$showPartCopyButton,
&$showArticleButton,
&$bossData, &$bossData,
&$isEBCEBooks, &$isEBCEBooks,
&$hideNotice, &$hideNotice,
...@@ -318,6 +329,8 @@ class GetIt extends AbstractHelper ...@@ -318,6 +329,8 @@ class GetIt extends AbstractHelper
{ {
$boxHeadline = $this->fidClient->isLoggedOn() ? $this->translate('Get it') : $this->translate('getit_logged_not'); $boxHeadline = $this->fidClient->isLoggedOn() ? $this->translate('Get it') : $this->translate('getit_logged_not');
$notice = $this->fidClient->isLoggedOn() ? $this->translate('getit_text_12') : $this->translate('getit_text_2'); $notice = $this->fidClient->isLoggedOn() ? $this->translate('getit_text_12') : $this->translate('getit_text_2');
$showOrderButton = isset($this->config->Permission->allowPDA) ?
$this->config->Permission->allowPDA : true;
} }
/** /**
...@@ -330,6 +343,7 @@ class GetIt extends AbstractHelper ...@@ -330,6 +343,7 @@ class GetIt extends AbstractHelper
* @param $showLinks boolean display links * @param $showLinks boolean display links
* @param $showOrderButton boolean display order button * @param $showOrderButton boolean display order button
* @param $showPartCopyButton boolean display part copy button * @param $showPartCopyButton boolean display part copy button
* @param $showArticleButton boolean display part copy button
* @param $bossData boolean display data of BOSS webservice * @param $bossData boolean display data of BOSS webservice
* @param $isEBCEBooks boolean is given record UBL-FID-EBC * @param $isEBCEBooks boolean is given record UBL-FID-EBC
* @param $hideNotice boolean hide notice * @param $hideNotice boolean hide notice
...@@ -343,6 +357,7 @@ class GetIt extends AbstractHelper ...@@ -343,6 +357,7 @@ class GetIt extends AbstractHelper
&$showLinks, &$showLinks,
&$showOrderButton, &$showOrderButton,
&$showPartCopyButton, &$showPartCopyButton,
&$showArticleButton,
&$bossData, &$bossData,
&$isEBCEBooks, &$isEBCEBooks,
&$hideNotice, &$hideNotice,
...@@ -366,6 +381,7 @@ class GetIt extends AbstractHelper ...@@ -366,6 +381,7 @@ class GetIt extends AbstractHelper
* @param $showLinks boolean display links * @param $showLinks boolean display links
* @param $showOrderButton boolean display order button * @param $showOrderButton boolean display order button
* @param $showPartCopyButton boolean display part copy button * @param $showPartCopyButton boolean display part copy button
* @param $showArticleButton boolean display part copy button
* @param $bossData boolean display data of BOSS webservice * @param $bossData boolean display data of BOSS webservice
* @param $isEBCEBooks boolean is given record UBL-FID-EBC * @param $isEBCEBooks boolean is given record UBL-FID-EBC
* @param $hideNotice boolean hide notice * @param $hideNotice boolean hide notice
...@@ -379,6 +395,7 @@ class GetIt extends AbstractHelper ...@@ -379,6 +395,7 @@ class GetIt extends AbstractHelper
&$showLinks, &$showLinks,
&$showOrderButton, &$showOrderButton,
&$showPartCopyButton, &$showPartCopyButton,
&$showArticleButton,
&$bossData, &$bossData,
&$isEBCEBooks, &$isEBCEBooks,
&$hideNotice, &$hideNotice,
...@@ -398,6 +415,7 @@ class GetIt extends AbstractHelper ...@@ -398,6 +415,7 @@ class GetIt extends AbstractHelper
* @param $showLinks boolean display links * @param $showLinks boolean display links
* @param $showOrderButton boolean display order button * @param $showOrderButton boolean display order button
* @param $showPartCopyButton boolean display part copy button * @param $showPartCopyButton boolean display part copy button
* @param $showArticleButton boolean display part copy button
* @param $bossData boolean display data of BOSS webservice * @param $bossData boolean display data of BOSS webservice
* @param $isEBCEBooks boolean is given record UBL-FID-EBC * @param $isEBCEBooks boolean is given record UBL-FID-EBC
* @param $hideNotice boolean hide notice * @param $hideNotice boolean hide notice
...@@ -411,6 +429,7 @@ class GetIt extends AbstractHelper ...@@ -411,6 +429,7 @@ class GetIt extends AbstractHelper
&$showLinks, &$showLinks,
&$showOrderButton, &$showOrderButton,
&$showPartCopyButton, &$showPartCopyButton,
&$showArticleButton,
&$bossData, &$bossData,
&$isEBCEBooks, &$isEBCEBooks,
&$hideNotice, &$hideNotice,
...@@ -432,6 +451,7 @@ class GetIt extends AbstractHelper ...@@ -432,6 +451,7 @@ class GetIt extends AbstractHelper
* @param $showLinks boolean display links * @param $showLinks boolean display links
* @param $showOrderButton boolean display order button * @param $showOrderButton boolean display order button
* @param $showPartCopyButton boolean display part copy button * @param $showPartCopyButton boolean display part copy button
* @param $showArticleButton boolean display part copy button
* @param $bossData boolean display data of BOSS webservice * @param $bossData boolean display data of BOSS webservice
* @param $isEBCEBooks boolean is given record UBL-FID-EBC * @param $isEBCEBooks boolean is given record UBL-FID-EBC
* @param $hideNotice boolean hide notice * @param $hideNotice boolean hide notice
...@@ -445,6 +465,7 @@ class GetIt extends AbstractHelper ...@@ -445,6 +465,7 @@ class GetIt extends AbstractHelper
&$showLinks, &$showLinks,
&$showOrderButton, &$showOrderButton,
&$showPartCopyButton, &$showPartCopyButton,
&$showArticleButton,
&$bossData, &$bossData,
&$isEBCEBooks, &$isEBCEBooks,
&$hideNotice, &$hideNotice,
...@@ -578,7 +599,8 @@ class GetIt extends AbstractHelper ...@@ -578,7 +599,8 @@ class GetIt extends AbstractHelper
) { ) {
$bossData = true; $bossData = true;
if (!$this->isCollection) { if (!$this->isCollection) {
$showPartCopyButton = true; $showPartCopyButton = isset($this->config->Permission->allowSubitoPartialCopy) ?
$this->config->Permission->allowSubitoPartialCopy : true;
} }
} elseif (in_array('Local', $this->facetAvail) } elseif (in_array('Local', $this->facetAvail)
&& preg_grep($this->_getNonSourceIds('source_idsV8_3'), $this->format) && preg_grep($this->_getNonSourceIds('source_idsV8_3'), $this->format)
...@@ -616,6 +638,7 @@ class GetIt extends AbstractHelper ...@@ -616,6 +638,7 @@ class GetIt extends AbstractHelper
* @param $showLinks boolean display links * @param $showLinks boolean display links
* @param $showOrderButton boolean display order button * @param $showOrderButton boolean display order button
* @param $showPartCopyButton boolean display part copy button * @param $showPartCopyButton boolean display part copy button
* @param $showArticleButton boolean display part copy button
* @param $bossData boolean display data of BOSS webservice * @param $bossData boolean display data of BOSS webservice
* @param $isEBCEBooks boolean is given record UBL-FID-EBC * @param $isEBCEBooks boolean is given record UBL-FID-EBC
* @param $hideNotice boolean hide notice * @param $hideNotice boolean hide notice
...@@ -629,6 +652,7 @@ class GetIt extends AbstractHelper ...@@ -629,6 +652,7 @@ class GetIt extends AbstractHelper
&$showLinks, &$showLinks,
&$showOrderButton, &$showOrderButton,
&$showPartCopyButton, &$showPartCopyButton,
&$showArticleButton,
&$bossData, &$bossData,
&$isEBCEBooks, &$isEBCEBooks,
&$hideNotice, &$hideNotice,
...@@ -658,7 +682,8 @@ class GetIt extends AbstractHelper ...@@ -658,7 +682,8 @@ class GetIt extends AbstractHelper
&& !$this->isCollection && !$this->isCollection
&& !preg_grep($this->_getNonSourceIds('source_idsV8_8'), $this->collection) && !preg_grep($this->_getNonSourceIds('source_idsV8_8'), $this->collection)
) { ) {
$showOrderButton = true; $showOrderButton = isset($this->config->Permission->allowPDA) ?
$this->config->Permission->allowPDA : true;
} }
//END orderButton //END orderButton
//EBCEbooks //EBCEbooks
...@@ -680,6 +705,7 @@ class GetIt extends AbstractHelper ...@@ -680,6 +705,7 @@ class GetIt extends AbstractHelper
* @param $showLinks boolean display links * @param $showLinks boolean display links
* @param $showOrderButton boolean display order button * @param $showOrderButton boolean display order button
* @param $showPartCopyButton boolean display part copy button * @param $showPartCopyButton boolean display part copy button
* @param $showArticleButton boolean display part copy button
* @param $bossData boolean display data of BOSS webservice * @param $bossData boolean display data of BOSS webservice
* @param $isEBCEBooks boolean is given record UBL-FID-EBC * @param $isEBCEBooks boolean is given record UBL-FID-EBC
* @param $hideNotice boolean hide notice * @param $hideNotice boolean hide notice
...@@ -693,6 +719,7 @@ class GetIt extends AbstractHelper ...@@ -693,6 +719,7 @@ class GetIt extends AbstractHelper
&$showLinks, &$showLinks,
&$showOrderButton, &$showOrderButton,
&$showPartCopyButton, &$showPartCopyButton,
&$showArticleButton,
&$bossData, &$bossData,
&$isEBCEBooks, &$isEBCEBooks,
&$hideNotice, &$hideNotice,
...@@ -714,6 +741,7 @@ class GetIt extends AbstractHelper ...@@ -714,6 +741,7 @@ class GetIt extends AbstractHelper
* @param $showLinks boolean display links * @param $showLinks boolean display links
* @param $showOrderButton boolean display order button * @param $showOrderButton boolean display order button
* @param $showPartCopyButton boolean display part copy button * @param $showPartCopyButton boolean display part copy button
* @param $showArticleButton boolean display part copy button
* @param $bossData boolean display data of BOSS webservice * @param $bossData boolean display data of BOSS webservice
* @param $isEBCEBooks boolean is given record UBL-FID-EBC * @param $isEBCEBooks boolean is given record UBL-FID-EBC
* @param $hideNotice boolean hide notice * @param $hideNotice boolean hide notice
...@@ -727,6 +755,7 @@ class GetIt extends AbstractHelper ...@@ -727,6 +755,7 @@ class GetIt extends AbstractHelper
&$showLinks, &$showLinks,
&$showOrderButton, &$showOrderButton,
&$showPartCopyButton, &$showPartCopyButton,
&$showArticleButton,
&$bossData, &$bossData,
&$isEBCEBooks, &$isEBCEBooks,
&$hideNotice, &$hideNotice,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment