Project

General

Profile

Revision baedcd0f

IDbaedcd0fa0039fcb815b477941b7ff00dd85e400
Parent 71f6f653
Child 228aad1c

Added by Francois POIROTTE over 14 years ago

Amélioration de l'UI dans VigiBoard.
Mise à jour des fichiers de traduction dans les thèmes et dans VigiBoard.

git-svn-id: https://vigilo-dev.si.c-s.fr/svn@1372 b22e2e97-25c9-44ff-b637-2e5ceca36478

View differences:

vigiboard/controllers/root.py
15 15
from vigiboard.model import DBSession
16 16
from vigiboard.model import Event, EventHistory, CorrEvent, \
17 17
                            Host, HostGroup, \
18
                            StateName, User
18
                            StateName, User, ServiceLowLevel
19 19
from repoze.what.predicates import Any, not_anonymous
20 20
from vigiboard.widgets.edit_event import edit_event_status_options
21 21
from vigiboard.controllers.vigiboardrequest import VigiboardRequest
22 22
from vigiboard.controllers.vigiboard_controller import VigiboardRootController
23
from vigilo.models.secondary_tables import HOST_GROUP_TABLE, \
24
                                            SERVICE_GROUP_TABLE
23 25

  
24 26
__all__ = ('RootController', )
25 27

  
......
120 122
        total_rows = aggregates.num_rows()
121 123
        items_per_page = int(config['vigiboard_items_per_page'])
122 124

  
123
        if total_rows <= items_per_page * (page-1):
124
            page = 1
125 125
        id_first_row = items_per_page * (page-1)
126 126
        id_last_row = min(id_first_row + items_per_page, total_rows)
127 127

  
128 128
        aggregates.format_events(id_first_row, id_last_row)
129 129
        aggregates.generate_tmpl_context()
130

  
130 131
        nb_pages = int(math.ceil(total_rows / (items_per_page + 0.0)))
132
        if not total_rows:
133
            id_first_row = 0
134
        else:
135
            id_first_row += 1
131 136

  
132 137
        return dict(
133 138
                   events = aggregates.events,
134 139
                   rows_info = {
135
                       'id_first_row': id_first_row + 1,
140
                       'id_first_row': id_first_row,
136 141
                       'id_last_row': id_last_row,
137 142
                       'total_rows': total_rows,
138 143
                   },
139
                   pages = range(1, nb_pages + 1),
144
                   nb_pages = nb_pages,
140 145
                   page = page,
141 146
                   event_edit_status_options = edit_event_status_options,
142 147
                   history = [],
......
146 151
                   refresh_times=self.refresh_times,
147 152
                )
148 153
      
149
    @validate(validators={'idcorrevent':validators.String(not_empty=True)},
154
    @validate(validators={'idcorrevent':validators.Int(not_empty=True)},
150 155
            error_handler=process_form_errors)
151 156
    @expose('json')
152 157
    @require(Any(not_anonymous(), msg=_("You need to be authenticated")))
......
164 169
        username = request.environ.get('repoze.who.identity'
165 170
                    ).get('repoze.who.userid')
166 171
        user = User.by_user_name(username)
172
        user_groups = user.groups
167 173

  
174
#        try:
168 175
        event = DBSession.query(
169 176
                        CorrEvent.priority,
170 177
                        Event,
171 178
                 ).join(
172 179
                    (Event, CorrEvent.idcause == Event.idevent),
173
                    (HostGroup, Event.hostname == HostGroup.hostname),
174
                 ).filter(HostGroup.idgroup.in_(user.groups)
175
                 ).filter(CorrEvent.idcorrevent == idcorrevent
176
                 ).one()
180
                    (ServiceLowLevel, Event.idsupitem == ServiceLowLevel.idservice),
181
                    (Host, Host.idhost == ServiceLowLevel.idhost),
182
                    (HOST_GROUP_TABLE, HOST_GROUP_TABLE.c.idhost == Host.idhost),
183
                    (SERVICE_GROUP_TABLE, SERVICE_GROUP_TABLE.c.idservice == \
184
                        ServiceLowLevel.idservice),
185
                 ).filter(HOST_GROUP_TABLE.c.idgroup.in_(user_groups)
186
                 ).filter(SERVICE_GROUP_TABLE.c.idgroup.in_(user_groups)
187
                 ).filter(
188
                    # On masque les événements avec l'état OK
189
                    # et traités (status == u'AAClosed').
190
                    not_(and_(
191
                        StateName.statename == u'OK',
192
                        CorrEvent.status == u'AAClosed'
193
                    ))
194
                ).filter(CorrEvent.idcorrevent == idcorrevent
195
                ).one()
196
#        except:
197
#            # XXX Raise some HTTP error.
198
#            return None
177 199

  
178 200
        history = DBSession.query(
179 201
                    EventHistory,
......
187 209

  
188 210
            eventdetails[edname] = edlink[1] % {
189 211
                    'idcorrevent': idcorrevent,
190
                    'host': event[1].hostname,
191
                    'service': event[1].servicename
212
                    'host': event[1].supitem.host.name,
213
                    'service': event[1].supitem.servicename
192 214
                    }
193 215

  
194 216
        return dict(
......
199 221
                peak_state = StateName.value_to_statename(
200 222
                                    event[1].peak_state),
201 223
                idcorrevent = idcorrevent,
202
                host = event[1].hostname,
203
                service = event[1].servicename,
224
                host = event[1].supitem.host.name,
225
                service = event[1].supitem.servicename,
204 226
                eventdetails = eventdetails,
205 227
            )
206 228

  
207
    @validate(validators={'idcorrevent':validators.String(not_empty=True)},
229
    @validate(validators={'idcorrevent':validators.Int(not_empty=True)},
208 230
            error_handler=process_form_errors)
209 231
    @expose('vigiboard.html')
210 232
    @require(Any(not_anonymous(), msg=_("You need to be authenticated")))
......
236 258
                        'id_last_row': 1,
237 259
                        'total_rows': 1,
238 260
                    },
239
                    pages = [1],
261
                    nb_pages = 1,
240 262
                    page = 1,
241 263
                    event_edit_status_options = edit_event_status_options,
242 264
                    history = events.hist,
......
268 290

  
269 291
        username = request.environ['repoze.who.identity']['repoze.who.userid']
270 292
        events = VigiboardRequest(User.by_user_name(username))
271
        events.add_filter(Event.hostname == host,
272
                Event.servicename == service)
293
        events.add_join((ServiceLowLevel, ServiceLowLevel.idservice == Event.idsupitem))
294
        events.add_join((Host, ServiceLowLevel.idhost == Host.idhost))
295
        events.add_filter(Host.name == host,
296
                ServiceLowLevel.servicename == service)
297

  
273 298
        # XXX On devrait avoir une autre API que ça !!!
274 299
        # Supprime le filtre qui empêche d'obtenir des événements fermés
275 300
        # (ie: ayant l'état Nagios 'OK' et le statut 'AAClosed').
......
291 316
                        'id_last_row': 1,
292 317
                        'total_rows': 1,
293 318
                    },
294
                    pages = [1],
319
                    nb_pages = 1,
295 320
                    page = 1,
296 321
                    event_edit_status_options = edit_event_status_options,
297 322
                    history = events.hist,
vigiboard/controllers/vigiboard_plugin/shn.py
59 59
                .filter(CorrEvent.idcorrevent == idcorrevent).one()
60 60
        shns = correvent.high_level_services
61 61

  
62
        return dict(shns=[shn.name for shn in shns]) 
62
        return dict(shns=[shn.servicename for shn in shns]) 
63 63

  
vigiboard/controllers/vigiboardrequest.py
274 274
                    break
275 275
            self.orderby.append(i)
276 276

  
277
    def format_events_img_status(self, event):
277
    def format_events_status(self, event):
278 278
        
279 279
        """
280 280
        Suivant l'état de l'événement, retourne la classe à appliquer
281
        à l'image indiquant si l'événement est pris en compte ou non.
281
        à l'image indiquant si l'événement est pris en compte ou non,
282
        ainsi qu'un texte indiquant l'état.
282 283

  
283 284
        @param event: l'événement à analyser
284 285

  
285 286
        @return: Dictionnaire représentant la classe à appliquer
287
            et l'état (sous une forme intelligible).
286 288
        """
287 289

  
288 290
        if event.status == 'AAClosed':
289
            return { 'src': url('/images/crossed.png') }
290
        elif event.status == 'Acknowledged' :
291
            return { 'src': url('/images/checked.png') }
291
            return {
292
                'src': url('/images/crossed.png'),
293
                'label': _('Closed'),
294
            }
295
        elif event.status == 'Acknowledged':
296
            return {
297
                'src': url('/images/checked.png'),
298
                'label': _('Acknowledged'),
299
            }
292 300
        else:
293 301
            return None
294 302

  
......
364 372
                    {'src': '/images/%s2.png' %
365 373
                        StateName.value_to_statename(
366 374
                        cause.current_state)},
367
                    self.format_events_img_status(event),
375
                    self.format_events_status(event),
368 376
                    [[j.__show__(event), j.style] for j in self.plugin]
369 377
                ])
370 378
            i += 1
vigiboard/i18n/en_US/LC_MESSAGES/vigiboard.po
8 8
"Project-Id-Version: vigiboard 0.1\n"
9 9
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
10 10
"POT-Creation-Date: 2009-07-06 11:19+0200\n"
11
"PO-Revision-Date: 2009-11-09 10:03+0100\n"
11
"PO-Revision-Date: 2009-12-02 12:07+0100\n"
12 12
"Last-Translator: Thomas ANDREJAK <thomas.andrejak@c-s.fr>\n"
13 13
"Language-Team: en_US <LL@li.org>\n"
14 14
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
......
21 21
msgid "We're sorry but we weren't able to process this request."
22 22
msgstr ""
23 23

  
24
#: vigiboard/controllers/root.py:45 vigiboard/controllers/root.py:141
25
#: vigiboard/controllers/root.py:196 vigiboard/controllers/root.py:242
26
#: vigiboard/controllers/root.py:299
24
#: vigiboard/controllers/root.py:35
25
msgid "Never"
26
msgstr ""
27

  
28
#: vigiboard/controllers/root.py:36
29
msgid "30 seconds"
30
msgstr ""
31

  
32
#: vigiboard/controllers/root.py:37
33
msgid "1 minute"
34
msgstr ""
35

  
36
#: vigiboard/controllers/root.py:38
37
msgid "5 minutes"
38
msgstr ""
39

  
40
#: vigiboard/controllers/root.py:39
41
msgid "10 minutes"
42
msgstr ""
43

  
44
#: vigiboard/controllers/root.py:56 vigiboard/controllers/root.py:157
45
#: vigiboard/controllers/root.py:232 vigiboard/controllers/root.py:279
46
#: vigiboard/controllers/root.py:340
27 47
msgid "You need to be authenticated"
28 48
msgstr ""
29 49

  
30
#: vigiboard/controllers/root.py:211
50
#: vigiboard/controllers/root.py:247
31 51
msgid "Error in DB"
32 52
msgstr ""
33 53

  
34
#: vigiboard/controllers/root.py:315
54
#: vigiboard/controllers/root.py:356
35 55
msgid "No event has been selected"
36 56
msgstr ""
37 57

  
38
#: vigiboard/controllers/root.py:329
58
#: vigiboard/controllers/root.py:370
39 59
msgid "No access to this event"
40 60
msgstr ""
41 61

  
42
#: vigiboard/controllers/root.py:347
62
#: vigiboard/controllers/root.py:388
43 63
#, python-format
44 64
msgid "Changed trouble ticket from '%s' to '%s'"
45 65
msgstr ""
46 66

  
47
#: vigiboard/controllers/root.py:361
67
#: vigiboard/controllers/root.py:402
48 68
#, python-format
49 69
msgid "Changed acknowledgement status from '%s' to '%s'"
50 70
msgstr ""
51 71

  
52
#: vigiboard/controllers/root.py:371
72
#: vigiboard/controllers/root.py:412
53 73
msgid "Updated successfully"
54 74
msgstr ""
55 75

  
......
66 86
msgid "We hope to see you soon!"
67 87
msgstr ""
68 88

  
69
#: vigiboard/controllers/vigiboardrequest.py:303
89
#: vigiboard/controllers/vigiboardrequest.py:293
90
msgid "Closed"
91
msgstr ""
92

  
93
#: vigiboard/controllers/vigiboardrequest.py:298
94
msgid "Acknowledged"
95
msgstr ""
96

  
97
#: vigiboard/controllers/vigiboardrequest.py:323
70 98
msgid "Date"
71 99
msgstr ""
72 100

  
73
#: vigiboard/controllers/vigiboardrequest.py:304
101
#: vigiboard/controllers/vigiboardrequest.py:324
74 102
msgid "Duration"
75 103
msgstr ""
76 104

  
77
#: vigiboard/controllers/vigiboardrequest.py:306
105
#: vigiboard/controllers/vigiboardrequest.py:326
78 106
msgid "Priority"
79 107
msgstr ""
80 108

  
81
#: vigiboard/controllers/vigiboardrequest.py:306
109
#: vigiboard/controllers/vigiboardrequest.py:326
82 110
msgid "ITIL Priority"
83 111
msgstr ""
84 112

  
85
#: vigiboard/controllers/vigiboardrequest.py:307
113
#: vigiboard/controllers/vigiboardrequest.py:327
86 114
msgid "Occurrence count"
87 115
msgstr ""
88 116

  
89
#: vigiboard/controllers/vigiboardrequest.py:308
117
#: vigiboard/controllers/vigiboardrequest.py:328
90 118
#: vigiboard/widgets/edit_event.py:41
91 119
msgid "Host"
92 120
msgstr ""
93 121

  
94
#: vigiboard/controllers/vigiboardrequest.py:309
122
#: vigiboard/controllers/vigiboardrequest.py:329
95 123
msgid "Service Type"
96 124
msgstr ""
97 125

  
98
#: vigiboard/controllers/vigiboardrequest.py:309
126
#: vigiboard/controllers/vigiboardrequest.py:329
99 127
msgid "Service Name"
100 128
msgstr ""
101 129

  
102
#: vigiboard/controllers/vigiboardrequest.py:311
130
#: vigiboard/controllers/vigiboardrequest.py:331
103 131
#: vigiboard/widgets/edit_event.py:43
104 132
msgid "Output"
105 133
msgstr ""
106 134

  
107
#: vigiboard/controllers/vigiboardrequest.py:314
135
#: vigiboard/controllers/vigiboardrequest.py:334
108 136
msgid "TT"
109 137
msgstr ""
110 138

  
111
#: vigiboard/controllers/vigiboardrequest.py:314
139
#: vigiboard/controllers/vigiboardrequest.py:334
112 140
#: vigiboard/widgets/edit_event.py:26 vigiboard/widgets/edit_event.py:44
113 141
msgid "Trouble Ticket"
114 142
msgstr ""
115 143

  
116
#: vigiboard/controllers/vigiboardrequest.py:419
144
#: vigiboard/controllers/vigiboardrequest.py:445
117 145
msgid "Edit Event"
118 146
msgstr ""
119 147

  
120
#: vigiboard/controllers/vigiboardrequest.py:425
148
#: vigiboard/controllers/vigiboardrequest.py:451
121 149
msgid "Search Event"
122 150
msgstr ""
123 151

  
124
#: vigiboard/controllers/vigiboardrequest.py:429
152
#: vigiboard/controllers/vigiboardrequest.py:455
125 153
msgid "History"
126 154
msgstr ""
127 155

  
vigiboard/i18n/fr_FR/LC_MESSAGES/vigiboard.po
8 8
"Project-Id-Version: vigiboard 0.1\n"
9 9
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
10 10
"POT-Creation-Date: 2009-07-06 11:19+0200\n"
11
"PO-Revision-Date: 2009-11-09 10:03+0100\n"
11
"PO-Revision-Date: 2009-12-02 12:07+0100\n"
12 12
"Last-Translator: Thomas ANDREJAK <thomas.andrejak@c-s.fr>\n"
13 13
"Language-Team: fr_FR <LL@li.org>\n"
14 14
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
......
21 21
msgid "We're sorry but we weren't able to process this request."
22 22
msgstr "Désolé mais nous n'avons pas pu traiter votre requête."
23 23

  
24
#: vigiboard/controllers/root.py:45 vigiboard/controllers/root.py:141
25
#: vigiboard/controllers/root.py:196 vigiboard/controllers/root.py:242
26
#: vigiboard/controllers/root.py:299
24
#: vigiboard/controllers/root.py:35
25
msgid "Never"
26
msgstr "Jamais"
27

  
28
#: vigiboard/controllers/root.py:36
29
msgid "30 seconds"
30
msgstr "30 secondes"
31

  
32
#: vigiboard/controllers/root.py:37
33
msgid "1 minute"
34
msgstr "1 minute"
35

  
36
#: vigiboard/controllers/root.py:38
37
msgid "5 minutes"
38
msgstr "5 minutes"
39

  
40
#: vigiboard/controllers/root.py:39
41
msgid "10 minutes"
42
msgstr "10 minutes"
43

  
44
#: vigiboard/controllers/root.py:56 vigiboard/controllers/root.py:157
45
#: vigiboard/controllers/root.py:232 vigiboard/controllers/root.py:279
46
#: vigiboard/controllers/root.py:340
27 47
msgid "You need to be authenticated"
28 48
msgstr "Vous devez être authentifié"
29 49

  
30
#: vigiboard/controllers/root.py:211
50
#: vigiboard/controllers/root.py:247
31 51
msgid "Error in DB"
32 52
msgstr "Erreur dans la base de données"
33 53

  
34
#: vigiboard/controllers/root.py:315
54
#: vigiboard/controllers/root.py:356
35 55
msgid "No event has been selected"
36 56
msgstr "Aucun événement sélectionné"
37 57

  
38
#: vigiboard/controllers/root.py:329
58
#: vigiboard/controllers/root.py:370
39 59
msgid "No access to this event"
40 60
msgstr "Accès à cet événement refusé"
41 61

  
42
#: vigiboard/controllers/root.py:347
62
#: vigiboard/controllers/root.py:388
43 63
#, python-format
44 64
msgid "Changed trouble ticket from '%s' to '%s'"
45 65
msgstr "A changé le ticket d'incidence de '%s' en '%s'"
46 66

  
47
#: vigiboard/controllers/root.py:361
67
#: vigiboard/controllers/root.py:402
48 68
#, python-format
49 69
msgid "Changed acknowledgement status from '%s' to '%s'"
50 70
msgstr "A changé l'état d'acquittement de '%s' en '%s'"
51 71

  
52
#: vigiboard/controllers/root.py:371
72
#: vigiboard/controllers/root.py:412
53 73
msgid "Updated successfully"
54 74
msgstr "Mise à jour réussie"
55 75

  
......
66 86
msgid "We hope to see you soon!"
67 87
msgstr "Nous espérons vous revoir bientôt!"
68 88

  
69
#: vigiboard/controllers/vigiboardrequest.py:303
89
#: vigiboard/controllers/vigiboardrequest.py:293
90
msgid "Closed"
91
msgstr "Fermé"
92

  
93
#: vigiboard/controllers/vigiboardrequest.py:298
94
msgid "Acknowledged"
95
msgstr "Pris en compte"
96

  
97
#: vigiboard/controllers/vigiboardrequest.py:323
70 98
msgid "Date"
71 99
msgstr "Date"
72 100

  
73
#: vigiboard/controllers/vigiboardrequest.py:304
101
#: vigiboard/controllers/vigiboardrequest.py:324
74 102
msgid "Duration"
75 103
msgstr "Durée"
76 104

  
77
#: vigiboard/controllers/vigiboardrequest.py:306
105
#: vigiboard/controllers/vigiboardrequest.py:326
78 106
msgid "Priority"
79 107
msgstr "Priorité"
80 108

  
81
#: vigiboard/controllers/vigiboardrequest.py:306
109
#: vigiboard/controllers/vigiboardrequest.py:326
82 110
msgid "ITIL Priority"
83 111
msgstr "Priorité ITIL"
84 112

  
85
#: vigiboard/controllers/vigiboardrequest.py:307
113
#: vigiboard/controllers/vigiboardrequest.py:327
86 114
msgid "Occurrence count"
87 115
msgstr "Nombre d'occurrences"
88 116

  
89
#: vigiboard/controllers/vigiboardrequest.py:308
117
#: vigiboard/controllers/vigiboardrequest.py:328
90 118
#: vigiboard/widgets/edit_event.py:41
91 119
msgid "Host"
92 120
msgstr "Hôte"
93 121

  
94
#: vigiboard/controllers/vigiboardrequest.py:309
122
#: vigiboard/controllers/vigiboardrequest.py:329
95 123
msgid "Service Type"
96 124
msgstr "Type de service"
97 125

  
98
#: vigiboard/controllers/vigiboardrequest.py:309
126
#: vigiboard/controllers/vigiboardrequest.py:329
99 127
msgid "Service Name"
100 128
msgstr "Nom du service"
101 129

  
102
#: vigiboard/controllers/vigiboardrequest.py:311
130
#: vigiboard/controllers/vigiboardrequest.py:331
103 131
#: vigiboard/widgets/edit_event.py:43
104 132
msgid "Output"
105 133
msgstr "Sortie d'erreur"
106 134

  
107
#: vigiboard/controllers/vigiboardrequest.py:314
135
#: vigiboard/controllers/vigiboardrequest.py:334
108 136
msgid "TT"
109 137
msgstr "TT"
110 138

  
111
#: vigiboard/controllers/vigiboardrequest.py:314
139
#: vigiboard/controllers/vigiboardrequest.py:334
112 140
#: vigiboard/widgets/edit_event.py:26 vigiboard/widgets/edit_event.py:44
113 141
msgid "Trouble Ticket"
114 142
msgstr "Ticket d'incidence"
115 143

  
116
#: vigiboard/controllers/vigiboardrequest.py:419
144
#: vigiboard/controllers/vigiboardrequest.py:445
117 145
msgid "Edit Event"
118 146
msgstr "Edition d'événements"
119 147

  
120
#: vigiboard/controllers/vigiboardrequest.py:425
148
#: vigiboard/controllers/vigiboardrequest.py:451
121 149
msgid "Search Event"
122 150
msgstr "Recherche d'événements"
123 151

  
124
#: vigiboard/controllers/vigiboardrequest.py:429
152
#: vigiboard/controllers/vigiboardrequest.py:455
125 153
msgid "History"
126 154
msgstr "Historique"
127 155

  
......
138 166
msgstr "Services de Haut Niveau impactes"
139 167

  
140 168
#: vigiboard/controllers/vigiboard_plugin/shn.py:51
141
#, fuzzy
142 169
msgid "High-Level Services"
143
msgstr "Service de Haut Niveau"
170
msgstr "Services de Haut Niveau"
144 171

  
145 172
#: vigiboard/widgets/edit_event.py:9
146 173
msgid "No change"
vigiboard/i18n/vigiboard.pot
8 8
msgstr ""
9 9
"Project-Id-Version: vigiboard 0.1\n"
10 10
"Report-Msgid-Bugs-To: contact@projet-vigilo.org\n"
11
"POT-Creation-Date: 2009-11-09 10:03+0100\n"
11
"POT-Creation-Date: 2009-12-02 12:06+0100\n"
12 12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14
"Language-Team: LANGUAGE <LL@li.org>\n"
......
21 21
msgid "We're sorry but we weren't able to process this request."
22 22
msgstr ""
23 23

  
24
#: vigiboard/controllers/root.py:45 vigiboard/controllers/root.py:141
25
#: vigiboard/controllers/root.py:196 vigiboard/controllers/root.py:242
26
#: vigiboard/controllers/root.py:299
24
#: vigiboard/controllers/root.py:35
25
msgid "Never"
26
msgstr ""
27

  
28
#: vigiboard/controllers/root.py:36
29
msgid "30 seconds"
30
msgstr ""
31

  
32
#: vigiboard/controllers/root.py:37
33
msgid "1 minute"
34
msgstr ""
35

  
36
#: vigiboard/controllers/root.py:38
37
msgid "5 minutes"
38
msgstr ""
39

  
40
#: vigiboard/controllers/root.py:39
41
msgid "10 minutes"
42
msgstr ""
43

  
44
#: vigiboard/controllers/root.py:56 vigiboard/controllers/root.py:157
45
#: vigiboard/controllers/root.py:232 vigiboard/controllers/root.py:279
46
#: vigiboard/controllers/root.py:340
27 47
msgid "You need to be authenticated"
28 48
msgstr ""
29 49

  
30
#: vigiboard/controllers/root.py:211
50
#: vigiboard/controllers/root.py:247
31 51
msgid "Error in DB"
32 52
msgstr ""
33 53

  
34
#: vigiboard/controllers/root.py:315
54
#: vigiboard/controllers/root.py:356
35 55
msgid "No event has been selected"
36 56
msgstr ""
37 57

  
38
#: vigiboard/controllers/root.py:329
58
#: vigiboard/controllers/root.py:370
39 59
msgid "No access to this event"
40 60
msgstr ""
41 61

  
42
#: vigiboard/controllers/root.py:347
62
#: vigiboard/controllers/root.py:388
43 63
#, python-format
44 64
msgid "Changed trouble ticket from '%s' to '%s'"
45 65
msgstr ""
46 66

  
47
#: vigiboard/controllers/root.py:361
67
#: vigiboard/controllers/root.py:402
48 68
#, python-format
49 69
msgid "Changed acknowledgement status from '%s' to '%s'"
50 70
msgstr ""
51 71

  
52
#: vigiboard/controllers/root.py:371
72
#: vigiboard/controllers/root.py:412
53 73
msgid "Updated successfully"
54 74
msgstr ""
55 75

  
......
66 86
msgid "We hope to see you soon!"
67 87
msgstr ""
68 88

  
69
#: vigiboard/controllers/vigiboardrequest.py:303
89
#: vigiboard/controllers/vigiboardrequest.py:293
90
msgid "Closed"
91
msgstr ""
92

  
93
#: vigiboard/controllers/vigiboardrequest.py:298
94
msgid "Acknowledged"
95
msgstr ""
96

  
97
#: vigiboard/controllers/vigiboardrequest.py:323
70 98
msgid "Date"
71 99
msgstr ""
72 100

  
73
#: vigiboard/controllers/vigiboardrequest.py:304
101
#: vigiboard/controllers/vigiboardrequest.py:324
74 102
msgid "Duration"
75 103
msgstr ""
76 104

  
77
#: vigiboard/controllers/vigiboardrequest.py:306
105
#: vigiboard/controllers/vigiboardrequest.py:326
78 106
msgid "Priority"
79 107
msgstr ""
80 108

  
81
#: vigiboard/controllers/vigiboardrequest.py:306
109
#: vigiboard/controllers/vigiboardrequest.py:326
82 110
msgid "ITIL Priority"
83 111
msgstr ""
84 112

  
85
#: vigiboard/controllers/vigiboardrequest.py:307
113
#: vigiboard/controllers/vigiboardrequest.py:327
86 114
msgid "Occurrence count"
87 115
msgstr ""
88 116

  
89
#: vigiboard/controllers/vigiboardrequest.py:308 vigiboard/widgets/edit_event.py:41
117
#: vigiboard/controllers/vigiboardrequest.py:328 vigiboard/widgets/edit_event.py:41
90 118
msgid "Host"
91 119
msgstr ""
92 120

  
93
#: vigiboard/controllers/vigiboardrequest.py:309
121
#: vigiboard/controllers/vigiboardrequest.py:329
94 122
msgid "Service Type"
95 123
msgstr ""
96 124

  
97
#: vigiboard/controllers/vigiboardrequest.py:309
125
#: vigiboard/controllers/vigiboardrequest.py:329
98 126
msgid "Service Name"
99 127
msgstr ""
100 128

  
101
#: vigiboard/controllers/vigiboardrequest.py:311 vigiboard/widgets/edit_event.py:43
129
#: vigiboard/controllers/vigiboardrequest.py:331 vigiboard/widgets/edit_event.py:43
102 130
msgid "Output"
103 131
msgstr ""
104 132

  
105
#: vigiboard/controllers/vigiboardrequest.py:314
133
#: vigiboard/controllers/vigiboardrequest.py:334
106 134
msgid "TT"
107 135
msgstr ""
108 136

  
109
#: vigiboard/controllers/vigiboardrequest.py:314 vigiboard/widgets/edit_event.py:26
137
#: vigiboard/controllers/vigiboardrequest.py:334 vigiboard/widgets/edit_event.py:26
110 138
#: vigiboard/widgets/edit_event.py:44
111 139
msgid "Trouble Ticket"
112 140
msgstr ""
113 141

  
114
#: vigiboard/controllers/vigiboardrequest.py:419
142
#: vigiboard/controllers/vigiboardrequest.py:445
115 143
msgid "Edit Event"
116 144
msgstr ""
117 145

  
118
#: vigiboard/controllers/vigiboardrequest.py:425
146
#: vigiboard/controllers/vigiboardrequest.py:451
119 147
msgid "Search Event"
120 148
msgstr ""
121 149

  
122
#: vigiboard/controllers/vigiboardrequest.py:429
150
#: vigiboard/controllers/vigiboardrequest.py:455
123 151
msgid "History"
124 152
msgstr ""
125 153

  

Also available in: Unified diff