[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: ExtendedSearch: readded create page from search

2017-01-17 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332330 )

Change subject: ExtendedSearch: readded create page from search
..


ExtendedSearch: readded create page from search

Fixed issue from ERM4026

Change-Id: I526fb0f897613d459fee4abaeb5877ff91645cae
---
M ExtendedSearch/views/view.SearchSuggest.php
1 file changed, 45 insertions(+), 3 deletions(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/ExtendedSearch/views/view.SearchSuggest.php 
b/ExtendedSearch/views/view.SearchSuggest.php
index 90bbfb7..eb90401 100644
--- a/ExtendedSearch/views/view.SearchSuggest.php
+++ b/ExtendedSearch/views/view.SearchSuggest.php
@@ -32,11 +32,24 @@
public function execute( $aParam = false ) {
$sSearch = str_replace( 
BsCore::getForbiddenCharsInArticleTitle(), '', $this->getOption( 'search' ) );
$oTitle  = Title::newFromText( $sSearch );
+
+   $aLinks = [];
+   if( !$oTitle->exists() ) {
+   $aLinks['bs-extendedsearch-suggest'] = [
+   'href' => $oTitle->getLocalURL(),
+   'title' => wfMessage( 
'bs-extendedsearch-create-page', $oTitle->getPrefixedText() )->plain(),
+   'text' => wfMessage( 
'bs-extendedsearch-create-page', $oTitle->getPrefixedText() )->plain()
+   ];
+   }
+
+   Hooks::run( 'BSExtendedSearchSpecialPageTermLinks', [ &$aLinks 
] );
+
+   $sCreatesuggest  = '';
+   $sCreatesuggest .= $this->renderList( $aLinks );
+
$sSearchUrlencoded   = urlencode( $sSearch );
$sSearchHtmlEntities = htmlentities( $sSearch, ENT_QUOTES, 
'UTF-8' );
-   $sCreatesuggest  = '';
-
-   wfRunHooks( 'BSExtendedSearchAdditionalActions', array( 
&$sCreatesuggest, &$sSearchUrlencoded, &$sSearchHtmlEntities, &$oTitle ) );
+   Hooks::run( 'BSExtendedSearchAdditionalActions', array( 
&$sCreatesuggest, &$sSearchUrlencoded, &$sSearchHtmlEntities, &$oTitle ), 
'2.27' );
 
$sCreatesuggest .= '';
$sCreatesuggest .= '';
@@ -44,4 +57,33 @@
return $sCreatesuggest;
}
 
+   /**
+* Renders a given array to links in list items.
+*
+* @param $aLinks array An array of links.
+* @return string Returns the HTML from the given array.
+*/
+   private function renderList( $aLinks ) {
+   $sResult = '';
+
+   foreach ($aLinks as $sId => $aItem) {
+   $sResult .= Html::rawElement(
+   'li',
+   array(
+   ),
+   Html::element(
+   'a',
+   array(
+   'id' => $sId,
+   'title' => $aItem['title'],
+   'href' => $aItem['href'],
+   'text' => $aItem['text']
+   ),
+   $aItem['text']
+   )
+   );
+   }
+
+   return $sResult;
+   }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/332330
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I526fb0f897613d459fee4abaeb5877ff91645cae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Nasty 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: ExtendedSearch: readded create page from search

2017-01-16 Thread Nasty (Code Review) 
Nasty has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332330 )

Change subject: ExtendedSearch: readded create page from search
..

ExtendedSearch: readded create page from search

Fixed issue from ERM4026

Change-Id: I526fb0f897613d459fee4abaeb5877ff91645cae
---
M ExtendedSearch/views/view.SearchSuggest.php
1 file changed, 45 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/30/332330/1

diff --git a/ExtendedSearch/views/view.SearchSuggest.php 
b/ExtendedSearch/views/view.SearchSuggest.php
index 90bbfb7..eb90401 100644
--- a/ExtendedSearch/views/view.SearchSuggest.php
+++ b/ExtendedSearch/views/view.SearchSuggest.php
@@ -32,11 +32,24 @@
public function execute( $aParam = false ) {
$sSearch = str_replace( 
BsCore::getForbiddenCharsInArticleTitle(), '', $this->getOption( 'search' ) );
$oTitle  = Title::newFromText( $sSearch );
+
+   $aLinks = [];
+   if( !$oTitle->exists() ) {
+   $aLinks['bs-extendedsearch-suggest'] = [
+   'href' => $oTitle->getLocalURL(),
+   'title' => wfMessage( 
'bs-extendedsearch-create-page', $oTitle->getPrefixedText() )->plain(),
+   'text' => wfMessage( 
'bs-extendedsearch-create-page', $oTitle->getPrefixedText() )->plain()
+   ];
+   }
+
+   Hooks::run( 'BSExtendedSearchSpecialPageTermLinks', [ &$aLinks 
] );
+
+   $sCreatesuggest  = '';
+   $sCreatesuggest .= $this->renderList( $aLinks );
+
$sSearchUrlencoded   = urlencode( $sSearch );
$sSearchHtmlEntities = htmlentities( $sSearch, ENT_QUOTES, 
'UTF-8' );
-   $sCreatesuggest  = '';
-
-   wfRunHooks( 'BSExtendedSearchAdditionalActions', array( 
&$sCreatesuggest, &$sSearchUrlencoded, &$sSearchHtmlEntities, &$oTitle ) );
+   Hooks::run( 'BSExtendedSearchAdditionalActions', array( 
&$sCreatesuggest, &$sSearchUrlencoded, &$sSearchHtmlEntities, &$oTitle ), 
'2.27' );
 
$sCreatesuggest .= '';
$sCreatesuggest .= '';
@@ -44,4 +57,33 @@
return $sCreatesuggest;
}
 
+   /**
+* Renders a given array to links in list items.
+*
+* @param $aLinks array An array of links.
+* @return string Returns the HTML from the given array.
+*/
+   private function renderList( $aLinks ) {
+   $sResult = '';
+
+   foreach ($aLinks as $sId => $aItem) {
+   $sResult .= Html::rawElement(
+   'li',
+   array(
+   ),
+   Html::element(
+   'a',
+   array(
+   'id' => $sId,
+   'title' => $aItem['title'],
+   'href' => $aItem['href'],
+   'text' => $aItem['text']
+   ),
+   $aItem['text']
+   )
+   );
+   }
+
+   return $sResult;
+   }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/332330
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I526fb0f897613d459fee4abaeb5877ff91645cae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Nasty 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits