Skip to content

Commit 226a495

Browse files
Sae126VSae126V
committed
[GT-183] Apply code styles for the files in (#461)
1 parent 7bc3b3f commit 226a495

File tree

10 files changed

+1002
-696
lines changed

10 files changed

+1002
-696
lines changed

‎config/web_portal/menu.xml‎

Lines changed: 159 additions & 167 deletions
Original file line numberDiff line numberDiff line change
@@ -1,171 +1,163 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<menus>
3-
<main_menu>
4-
<spacer>
5-
<show_on_instance>all</show_on_instance>
6-
<spacer>Browse</spacer>
7-
</spacer>
8-
9-
<MySites>
10-
<show_on_instance>all</show_on_instance>
11-
<name>My Resources</name>
12-
<link>index.php?Page_Type=My_Sites</link>
13-
</MySites>
14-
15-
<Projects>
16-
<show_on_instance>all</show_on_instance>
17-
<name>Projects</name>
18-
<link>index.php?Page_Type=Projects</link>
19-
</Projects>
20-
21-
<NGI> <!-- was 'roc' -->
22-
<show_on_instance>all</show_on_instance>
23-
<name>NGIs</name>
24-
<link>index.php?Page_Type=NGIs</link>
25-
</NGI>
26-
27-
<Sites>
28-
<show_on_instance>all</show_on_instance>
29-
<name>Sites</name>
30-
<link>index.php?Page_Type=Sites</link>
31-
</Sites>
32-
33-
<ServiceGroups>
34-
<show_on_instance>all</show_on_instance>
35-
<name>Service Groups</name>
36-
<link>index.php?Page_Type=Service_Groups</link>
37-
</ServiceGroups>
38-
39-
<Services>
40-
<show_on_instance>all</show_on_instance>
41-
<name>Services</name>
42-
<link>index.php?Page_Type=Services</link>
43-
</Services>
44-
45-
<ServiceTypes>
46-
<show_on_instance>all</show_on_instance>
47-
<name>Service Types</name>
48-
<link>index.php?Page_Type=Service_Types</link>
49-
</ServiceTypes>
50-
51-
<Scopes>
52-
<show_on_instance>all</show_on_instance>
53-
<name>Scopes</name>
54-
<link>index.php?Page_Type=Scopes</link>
55-
</Scopes>
56-
57-
<RoleActionMappings>
58-
<show_on_instance>all</show_on_instance>
59-
<name>Role Action Map</name>
60-
<link>index.php?Page_Type=View_Role_Action_Mappings</link>
61-
</RoleActionMappings>
62-
63-
<spacer>
64-
<spacer>Add</spacer>
65-
<show_on_instance>write_enabled</show_on_instance>
66-
</spacer>
67-
68-
<AddSite>
69-
<show_on_instance>write_enabled</show_on_instance>
70-
<name>Add Site</name>
71-
<link>index.php?Page_Type=Add_Site</link>
72-
</AddSite>
73-
74-
<AddServiceGroup>
75-
<show_on_instance>write_enabled</show_on_instance>
76-
<name>Add Service Group</name>
77-
<link>index.php?Page_Type=Add_Service_Group</link>
78-
</AddServiceGroup>
79-
80-
<AddService>
81-
<show_on_instance>write_enabled</show_on_instance>
82-
<name>Add Service</name>
83-
<link>index.php?Page_Type=Add_Service</link>
84-
</AddService>
85-
86-
<AddDowntime>
87-
<show_on_instance>write_enabled</show_on_instance>
88-
<name>Add Downtime</name>
89-
<link>index.php?Page_Type=Add_Downtime</link>
90-
</AddDowntime>
91-
92-
<spacer>
93-
<spacer>Downtimes</spacer>
94-
<show_on_instance>all</show_on_instance>
95-
</spacer>
96-
97-
98-
<!--<current_downtimes>
99-
<show_on_instance>all</show_on_instance>
100-
<name>Recent &amp; Planned</name>
101-
<link>http://operations-portal.in2p3.fr/index.php/dashboard/do</link>
102-
</current_downtimes>-->
103-
104-
<CurrentDowntimes>
105-
<show_on_instance>all</show_on_instance>
106-
<name>Active &amp; Imminent</name>
107-
<link>index.php?Page_Type=Downtimes_Overview</link>
108-
</CurrentDowntimes>
109-
110-
<Calendar>
111-
<show_on_instance>all</show_on_instance>
112-
<name>Downtime Calendar</name>
113-
<link>index.php?Page_Type=Downtimes_Calendar</link>
114-
</Calendar>
115-
116-
<spacer>
117-
<spacer>About GOCDB5</spacer>
118-
<show_on_instance>all</show_on_instance>
119-
</spacer>
120-
121-
122-
123-
<HelpAndContact>
124-
<show_on_instance>all</show_on_instance>
125-
<name>Doc, Help &amp; Support</name>
126-
<link>index.php?Page_Type=Static_HTML&amp;Page=Help_And_Contact</link>
127-
</HelpAndContact>
128-
129-
<spacer>
130-
<spacer>GOCDB Admin</spacer>
131-
<show_on_instance>admin</show_on_instance>
132-
</spacer>
133-
134-
<AddNGI>
135-
<show_on_instance>admin</show_on_instance>
136-
<name>Add NGI</name>
137-
<link>index.php?Page_Type=Admin_Add_NGI</link>
138-
</AddNGI>
139-
140-
<AddProject>
141-
<show_on_instance>admin</show_on_instance>
142-
<name>Add Project</name>
143-
<link>index.php?Page_Type=Admin_Add_Project</link>
144-
</AddProject>
145-
146-
<AddServiceTypes>
147-
<show_on_instance>admin</show_on_instance>
148-
<name>Add Service Type</name>
149-
<link>index.php?Page_Type=Admin_Add_Service_Type</link>
150-
</AddServiceTypes>
151-
152-
<MoveServiceEndPoint>
153-
<show_on_instance>admin</show_on_instance>
154-
<name>Move Service</name>
155-
<link>index.php?Page_Type=Admin_Move_SEP</link>
156-
</MoveServiceEndPoint>
157-
158-
<MoveSite>
159-
<show_on_instance>admin</show_on_instance>
160-
<name>Move Site</name>
161-
<link>index.php?Page_Type=Admin_Move_Site</link>
162-
</MoveSite>
163-
164-
<Users>
165-
<show_on_instance>admin</show_on_instance>
166-
<name>Users</name>
167-
<link>index.php?Page_Type=Admin_Users</link>
168-
</Users>
169-
3+
<main_menu>
4+
<spacer>
5+
<show_on_instance>all</show_on_instance>
6+
<spacer>Browse</spacer>
7+
</spacer>
8+
9+
<MySites>
10+
<show_on_instance>all</show_on_instance>
11+
<name>My Resources</name>
12+
<link>index.php?Page_Type=My_Sites</link>
13+
</MySites>
14+
15+
<Projects>
16+
<show_on_instance>all</show_on_instance>
17+
<name>Projects</name>
18+
<link>index.php?Page_Type=Projects</link>
19+
</Projects>
20+
21+
<NGI> <!-- was 'roc' -->
22+
<show_on_instance>all</show_on_instance>
23+
<name>NGIs</name>
24+
<link>index.php?Page_Type=NGIs</link>
25+
</NGI>
26+
27+
<Sites>
28+
<show_on_instance>all</show_on_instance>
29+
<name>Sites</name>
30+
<link>index.php?Page_Type=Sites</link>
31+
</Sites>
32+
33+
<ServiceGroups>
34+
<show_on_instance>all</show_on_instance>
35+
<name>Service Groups</name>
36+
<link>index.php?Page_Type=Service_Groups</link>
37+
</ServiceGroups>
38+
39+
<Services>
40+
<show_on_instance>all</show_on_instance>
41+
<name>Services</name>
42+
<link>index.php?Page_Type=Services</link>
43+
</Services>
44+
45+
<ServiceTypes>
46+
<show_on_instance>all</show_on_instance>
47+
<name>Service Types</name>
48+
<link>index.php?Page_Type=Service_Types</link>
49+
</ServiceTypes>
50+
51+
<Scopes>
52+
<show_on_instance>all</show_on_instance>
53+
<name>Scopes</name>
54+
<link>index.php?Page_Type=Scopes</link>
55+
</Scopes>
56+
57+
<RoleActionMappings>
58+
<show_on_instance>all</show_on_instance>
59+
<name>Role Action Map</name>
60+
<link>index.php?Page_Type=View_Role_Action_Mappings</link>
61+
</RoleActionMappings>
62+
63+
<spacer>
64+
<spacer>Add</spacer>
65+
<show_on_instance>write_enabled</show_on_instance>
66+
</spacer>
67+
68+
<AddSite>
69+
<show_on_instance>write_enabled</show_on_instance>
70+
<name>Add Site</name>
71+
<link>index.php?Page_Type=Add_Site</link>
72+
</AddSite>
73+
74+
<AddServiceGroup>
75+
<show_on_instance>write_enabled</show_on_instance>
76+
<name>Add Service Group</name>
77+
<link>index.php?Page_Type=Add_Service_Group</link>
78+
</AddServiceGroup>
79+
80+
<AddService>
81+
<show_on_instance>write_enabled</show_on_instance>
82+
<name>Add Service</name>
83+
<link>index.php?Page_Type=Add_Service</link>
84+
</AddService>
85+
86+
<AddDowntime>
87+
<show_on_instance>write_enabled</show_on_instance>
88+
<name>Add Downtime</name>
89+
<link>index.php?Page_Type=Add_Downtime</link>
90+
</AddDowntime>
91+
92+
<spacer>
93+
<spacer>Downtimes</spacer>
94+
<show_on_instance>all</show_on_instance>
95+
</spacer>
96+
97+
<CurrentDowntimes>
98+
<show_on_instance>all</show_on_instance>
99+
<name>Active &amp; Imminent</name>
100+
<link>index.php?Page_Type=Downtimes_Overview</link>
101+
</CurrentDowntimes>
102+
103+
<Calendar>
104+
<show_on_instance>all</show_on_instance>
105+
<name>Downtime Calendar</name>
106+
<link>index.php?Page_Type=Downtimes_Calendar</link>
107+
</Calendar>
108+
109+
<spacer>
110+
<spacer>About GOCDB5</spacer>
111+
<show_on_instance>all</show_on_instance>
112+
</spacer>
113+
114+
<HelpAndContact>
115+
<show_on_instance>all</show_on_instance>
116+
<name>Doc, Help &amp; Support</name>
117+
<link>
118+
index.php?Page_Type=Static_HTML&amp;Page=Help_And_Contact
119+
</link>
120+
</HelpAndContact>
121+
122+
<spacer>
123+
<spacer>GOCDB Admin</spacer>
124+
<show_on_instance>admin</show_on_instance>
125+
</spacer>
126+
127+
<AddNGI>
128+
<show_on_instance>admin</show_on_instance>
129+
<name>Add NGI</name>
130+
<link>index.php?Page_Type=Admin_Add_NGI</link>
131+
</AddNGI>
132+
133+
<AddProject>
134+
<show_on_instance>admin</show_on_instance>
135+
<name>Add Project</name>
136+
<link>index.php?Page_Type=Admin_Add_Project</link>
137+
</AddProject>
138+
139+
<AddServiceTypes>
140+
<show_on_instance>admin</show_on_instance>
141+
<name>Add Service Type</name>
142+
<link>index.php?Page_Type=Admin_Add_Service_Type</link>
143+
</AddServiceTypes>
144+
145+
<MoveServiceEndPoint>
146+
<show_on_instance>admin</show_on_instance>
147+
<name>Move Service</name>
148+
<link>index.php?Page_Type=Admin_Move_SEP</link>
149+
</MoveServiceEndPoint>
150+
151+
<MoveSite>
152+
<show_on_instance>admin</show_on_instance>
153+
<name>Move Site</name>
154+
<link>index.php?Page_Type=Admin_Move_Site</link>
155+
</MoveSite>
156+
157+
<Users>
158+
<show_on_instance>admin</show_on_instance>
159+
<name>Users</name>
160+
<link>index.php?Page_Type=Admin_Users</link>
161+
</Users>
170162
</main_menu>
171163
</menus>

‎htdocs/web_portal/controllers/service_type/view_service_type.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
*======================================================
55
* File: view_service_type.php
66
* Author: George Ryall, David Meredith
7-
* Description: Controller for displaying a service type and associated services
7+
* Description: Controller for displaying a service type
8+
* and associated services
89
*
910
* License information
1011
*
@@ -20,12 +21,14 @@
2021
* limitations under the License.
2122
/*======================================================*/
2223
require_once __DIR__ . '/../utils.php';
23-
require_once __DIR__ . '/../../../web_portal/components/Get_User_Principle.php';
24+
require_once __DIR__
25+
. '/../../../web_portal/components/Get_User_Principle.php';
26+
27+
use Exception;
2428

2529
function view_service_type()
2630
{
2731
$params = [];
28-
2932
$identifier = Get_User_Principle();
3033
$user = \Factory::getUserService()->getUserByPrinciple($identifier);
3134

@@ -45,7 +48,8 @@ function view_service_type()
4548
$params['Name'] = $serviceType->getName();
4649
$params['Description'] = $serviceType->getDescription();
4750
$params['ID'] = $serviceType->getId();
48-
$params['AllowMonitoringException'] = $serviceType->getAllowMonitoringException();
51+
$params['AllowMonitoringException'] = $serviceType
52+
->getAllowMonitoringException();
4953
$params['Services'] = $serv->getServices($params['ID']);
5054

5155
show_view("service_type/view_service_type.php", $params, $params['Name']);

‎htdocs/web_portal/controllers/service_type/view_service_types.php‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/*______________________________________________________
34
*======================================================
45
* File: view_service_types.php
@@ -20,12 +21,15 @@
2021
*
2122
/*====================================================== */
2223
require_once __DIR__ . '/../utils.php';
23-
require_once __DIR__ . '/../../../web_portal/components/Get_User_Principle.php';
24+
require_once __DIR__
25+
. '/../../../web_portal/components/Get_User_Principle.php';
2426

25-
function show_all(){
27+
function show_all()
28+
{
29+
$params = [];
2630

2731
$serviceTypes = \Factory::getServiceTypeService()->getServiceTypes();
28-
$params['ServiceTypes']= $serviceTypes;
32+
$params['ServiceTypes'] = $serviceTypes;
2933

3034
show_view('service_type/view_service_types.php', $params, 'Service Types');
3135
}

0 commit comments

Comments
 (0)