Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MetaGer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open-source
MetaGer
Commits
f1d8f68d
Commit
f1d8f68d
authored
6 years ago
by
Phil Höfer
Browse files
Options
Downloads
Plain Diff
Merge branch '652-anzahl-der-suchergebnisse-ausgeben' into 'development'
Resolve "Anzahl der Suchergebnisse ausgeben" Closes
#652
See merge request
!1247
parents
ae733e7c
a9154ecd
No related branches found
Branches containing commit
No related tags found
2 merge requests
!1262
WIP: Resolve "Spendenseite Texte anpassen"
,
!1247
Resolve "Anzahl der Suchergebnisse ausgeben"
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/MetaGer.php
+3
-3
3 additions, 3 deletions
app/MetaGer.php
app/Models/Searchengine.php
+1
-1
1 addition, 1 deletion
app/Models/Searchengine.php
resources/views/layouts/researchandtabs.blade.php
+0
-3
0 additions, 3 deletions
resources/views/layouts/researchandtabs.blade.php
with
4 additions
and
7 deletions
app/MetaGer.php
+
3
−
3
View file @
f1d8f68d
...
...
@@ -197,7 +197,8 @@ class MetaGer
->
with
(
'apiAuthorized'
,
$this
->
apiAuthorized
)
->
with
(
'metager'
,
$this
)
->
with
(
'browser'
,
(
new
Agent
())
->
browser
())
->
with
(
'quicktips'
,
$quicktipResults
);
->
with
(
'quicktips'
,
$quicktipResults
)
->
with
(
'resultcount'
,
count
(
$this
->
results
));
break
;
}
}
...
...
@@ -385,7 +386,6 @@ class MetaGer
$this
->
ads
[]
=
$ad
;
}
}
}
public
function
parseAdgoal
(
$results
)
...
...
@@ -1284,8 +1284,8 @@ class MetaGer
if
(
$result
->
isValid
(
$this
))
{
$results
[]
=
$result
;
}
}
$this
->
results
=
$results
;
}
public
function
atLeastOneSearchengineSelected
(
Request
$request
)
...
...
This diff is collapsed.
Click to expand it.
app/Models/Searchengine.php
+
1
−
1
View file @
f1d8f68d
...
...
@@ -93,7 +93,7 @@ abstract class Searchengine
abstract
public
function
loadResults
(
$result
);
#
???
#
Standardimplementierung der getNext Funktion, damit diese immer verwendet werden kann
public
function
getNext
(
MetaGer
$metager
,
$result
)
{
...
...
This diff is collapsed.
Click to expand it.
resources/views/layouts/researchandtabs.blade.php
+
0
−
3
View file @
f1d8f68d
...
...
@@ -31,9 +31,6 @@
@include('parts.errors')
@include('parts.warnings')
@yield('results')
@if( $metager->showQuicktips() )
<div
id=
"quicktips"
></div>
@endif
</div>
<div
id=
"additions-container"
>
<div
id=
"search-settings"
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment