Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Pixel Humain
api
Commits
1ec035b3
Commit
1ec035b3
authored
Dec 27, 2018
by
Tibor Katelbach
Browse files
Merge remote-tracking branch 'origin/development' into development
parents
e370ff72
b3282fc2
Pipeline
#2663
failed with stages
in 51 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
ApiModule.php
View file @
1ec035b3
...
...
@@ -29,6 +29,7 @@ class ApiModule extends CWebModule
$this
->
setImport
(
array
(
'citizenToolKit.models.*'
,
'eco.models.*'
,
'places.models.*'
,
$this
->
id
.
'.models.*'
,
$this
->
id
.
'.components.*'
,
$this
->
id
.
'.messages.*'
,
...
...
components/ApiController.php
View file @
1ec035b3
...
...
@@ -105,6 +105,9 @@ class ApiController extends Controller
'get'
=>
array
(
"href"
=>
"/ph/api/tool/get"
,
"public"
=>
true
),
'datetime'
=>
array
(
"href"
=>
"/ph/api/tool/datetime"
,
"public"
=>
true
),
),
"tags"
=>
array
(
'get'
=>
array
(
"href"
=>
"/ph/api/tags/get"
,
"public"
=>
true
),
),
"convert"
=>
array
(
"index"
=>
array
(
"href"
=>
"/ph/api/convert/index"
,
"public"
=>
true
),
"geojson"
=>
array
(
"href"
=>
"/ph/api/convert/geojson"
,
"public"
=>
true
),
...
...
@@ -121,9 +124,13 @@ class ApiController extends Controller
"educetab"
=>
array
(
"href"
=>
"/ph/api/convert/educetab"
,
"public"
=>
true
),
"valueflows"
=>
array
(
"href"
=>
"/ph/api/convert/valueflows"
,
"public"
=>
true
),
"organcity"
=>
array
(
"href"
=>
"/ph/api/convert/organcity"
,
"public"
=>
true
),
"gogocarto"
=>
array
(
"href"
=>
"/ph/api/convert/gogocarto"
,
"public"
=>
true
),
"get"
=>
array
(
"href"
=>
"/ph/api/convert/get"
,
"public"
=>
true
),
),
"poi"
=>
array
(
"get"
=>
array
(
"href"
=>
"/ph/api/poi/get"
,
"public"
=>
true
),
),
);
function
initPage
(){
...
...
controllers/ConvertController.php
View file @
1ec035b3
...
...
@@ -24,6 +24,7 @@ class ConvertController extends ApiController {
'educetab'
=>
'citizenToolKit.controllers.convert.EducEtabAction'
,
'valueflows'
=>
'citizenToolKit.controllers.convert.ValueFlowsAction'
,
'organcity'
=>
'citizenToolKit.controllers.convert.OrgancityAction'
,
'gogocarto'
=>
'citizenToolKit.controllers.convert.GogocartoAction'
,
);
}
...
...
controllers/PoiController.php
0 → 100644
View file @
1ec035b3
<?php
class
PoiController
extends
ApiController
{
protected
function
beforeAction
(
$action
)
{
parent
::
initPage
();
return
parent
::
beforeAction
(
$action
);
}
public
function
actions
()
{
return
array
(
'get'
=>
'citizenToolKit.controllers.poi.GetAction'
,
);
}
}
?>
\ No newline at end of file
controllers/TagsController.php
0 → 100644
View file @
1ec035b3
<?php
/**
* Created on examples of other controllers
* api tool datetime for update rtctime of Smart-Citizen-Kit
* @author: Jean Daniel CAZAL <danzalkay551@gmail.com>
* Date: 12/01/2017
*/
class
TagsController
extends
ApiController
{
protected
function
beforeAction
(
$action
)
{
parent
::
initPage
();
return
parent
::
beforeAction
(
$action
);
}
public
function
actions
(){
return
array
(
'get'
=>
'citizenToolKit.controllers.tags.GetAction'
);
}
}
?>
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment