Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
marcus-lodspeakr
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
uib-ub
Spesialsamlingene
marcus-lodspeakr
Commits
6c0892bd
Commit
6c0892bd
authored
13 years ago
by
alvaro
Browse files
Options
Downloads
Patches
Plain Diff
Fixed problems with service module when serving no html content
Fixed bug in googlemap filter
parent
e46e3dfb
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
classes/modules/serviceModule.php
+1
-1
1 addition, 1 deletion
classes/modules/serviceModule.php
lib/Haanga/lib/Haanga/Extension/Filter/Googlemaps.php
+2
-2
2 additions, 2 deletions
lib/Haanga/lib/Haanga/Extension/Filter/Googlemaps.php
with
3 additions
and
3 deletions
classes/modules/serviceModule.php
+
1
−
1
View file @
6c0892bd
...
@@ -27,9 +27,9 @@ class ServiceModule extends abstractModule{
...
@@ -27,9 +27,9 @@ class ServiceModule extends abstractModule{
}
}
return
array
(
$modelFile
,
$viewFile
);
return
array
(
$modelFile
,
$viewFile
);
}
elseif
(
file_exists
(
$lodspk
[
'model'
]
.
'queries'
)){
}
elseif
(
file_exists
(
$lodspk
[
'model'
]
.
'queries'
)){
if
(
$extension
!=
'html'
){
$lodspk
[
'resultRdf'
]
=
true
;}
$modelFile
=
$lodspk
[
'model'
]
.
'queries'
;
$modelFile
=
$lodspk
[
'model'
]
.
'queries'
;
if
(
!
file_exists
(
$lodspk
[
'view'
])){
if
(
!
file_exists
(
$lodspk
[
'view'
])){
$lodspk
[
'resultRdf'
]
=
true
;
$viewFile
=
null
;
$viewFile
=
null
;
}
else
{
}
else
{
$viewFile
=
$lodspk
[
'view'
];
$viewFile
=
$lodspk
[
'view'
];
...
...
This diff is collapsed.
Click to expand it.
lib/Haanga/lib/Haanga/Extension/Filter/Googlemaps.php
+
2
−
2
View file @
6c0892bd
...
@@ -50,7 +50,7 @@ class Haanga_Extension_Filter_Googlemaps{
...
@@ -50,7 +50,7 @@ class Haanga_Extension_Filter_Googlemaps{
$pre
=
"<div id='map_canvas_"
.
$randId
.
"' style='width: "
.
$w
.
"px; height: "
.
$h
.
"px'></div><script type='text/javascript'
$pre
=
"<div id='map_canvas_"
.
$randId
.
"' style='width: "
.
$w
.
"px; height: "
.
$h
.
"px'></div><script type='text/javascript'
src='http://maps.googleapis.com/maps/api/js?sensor=false'></script>
src='http://maps.googleapis.com/maps/api/js?sensor=false'></script>
<script type='text/javascript'>
<script type='text/javascript'>
<![CDATA[
//
<![CDATA[
function initialize() {
function initialize() {
var myOptions = {
var myOptions = {
zoom: 4,
zoom: 4,
...
@@ -89,7 +89,7 @@ class Haanga_Extension_Filter_Googlemaps{
...
@@ -89,7 +89,7 @@ class Haanga_Extension_Filter_Googlemaps{
}
}
google.maps.event.addDomListener(window, 'load', initialize);
google.maps.event.addDomListener(window, 'load', initialize);
]]>
//
]]>
</script>"
;
</script>"
;
return
$pre
;
return
$pre
;
}
}
...
...
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