Project

General

Profile

Revision 8cc57aa8

ID8cc57aa8dc330a5ec335e911fdacc1388f4b55e4
Parent 9b5ab541
Child 5acc6853

Added by Francois POIROTTE over 13 years ago

Réintroduction des modifs de la r5132 suite à écrasement par r5133.

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

View differences:

vigigraph/controllers/rpc.py
1 1
# -*- coding: utf-8 -*-
2 2
"""RPC controller for the combobox of vigigraph"""
3 3

  
4
import time, urlparse
4
import time, urlparse, urllib2
5 5
import logging
6 6

  
7 7
# La fonction parse_qsl a été déplacée dans Python 2.6.
......
23 23

  
24 24
from vigilo.turbogears.controllers import BaseController
25 25
from vigilo.turbogears.helpers import get_current_user
26
from vigilo.turbogears.controllers.proxy import get_through_proxy
26 27

  
27 28
from vigilo.models.session import DBSession
28 29
from vigilo.models.tables import Host
......
259 260
        indicators = [ind.name for ind in indicators]
260 261
        return dict(items=indicators)
261 262

  
263
    class StartTimeSchema(schema.Schema):
264
        """Schéma de validation pour la méthode L{getIndicators}."""
265
        host = validators.String(not_empty=True)
266
        nocache = validators.String(if_missing=None)
267

  
268
    # @TODO définir un error_handler différent pour remonter l'erreur via JS.
269
    @validate(
270
        validators = StartTimeSchema(),
271
        error_handler = process_form_errors)
272
    @expose('json')
273
    def startTime(self, host, nocache):
274
        return get_through_proxy(
275
            'vigirrd', host,
276
            '/starttime?host=%s' % urllib2.quote(host, '')
277
        )
262 278

  
263 279
    class FullHostPageSchema(schema.Schema):
264 280
        """Schéma de validation pour la méthode L{fullHostPage}."""
vigigraph/i18n/en/LC_MESSAGES/vigigraph.po
7 7
msgstr ""
8 8
"Project-Id-Version: vigigraph 2.0.0\n"
9 9
"Report-Msgid-Bugs-To: contact@projet-vigilo.org\n"
10
"POT-Creation-Date: 2010-11-17 13:47+0100\n"
11
"PO-Revision-Date: 2010-11-17 13:47+0100\n"
10
"POT-Creation-Date: 2010-11-17 17:44+0100\n"
11
"PO-Revision-Date: 2010-11-17 17:44+0100\n"
12 12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13
"Language-Team: en <LL@li.org>\n"
14 14
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
......
65 65
msgid "Last %d months"
66 66
msgstr "Last %d months"
67 67

  
68
#: vigigraph/controllers/rpc.py:68 vigigraph/public/js/graph.js:37
68
#: vigigraph/controllers/rpc.py:68 vigigraph/public/js/graph.js:36
69 69
msgid "Last year"
70 70
msgstr "Last year"
71 71

  
72 72
#. TRANSLATORS: Format Python de date/heure, lisible par un humain.
73
#: vigigraph/controllers/rpc.py:201
73
#: vigigraph/controllers/rpc.py:200
74 74
#, python-format
75 75
msgid "%a, %d %b %Y %H:%M:%S"
76 76
msgstr "%a, %d %b %Y %H:%M:%S"
77 77

  
78
#: vigigraph/public/js/graph.js:30
78
#: vigigraph/public/js/graph.js:29
79 79
msgid "Last 12 hours"
80 80
msgstr "Last 12 hours"
81 81

  
82
#: vigigraph/public/js/graph.js:31
82
#: vigigraph/public/js/graph.js:30
83 83
msgid "Last 24 hours"
84 84
msgstr "Last 24 hours"
85 85

  
86
#: vigigraph/public/js/graph.js:32
86
#: vigigraph/public/js/graph.js:31
87 87
msgid "Last 48 hours"
88 88
msgstr "Last 48 hours"
89 89

  
90
#: vigigraph/public/js/graph.js:33
90
#: vigigraph/public/js/graph.js:32
91 91
msgid "Last 7 days"
92 92
msgstr "Last 7 days"
93 93

  
94
#: vigigraph/public/js/graph.js:34
94
#: vigigraph/public/js/graph.js:33
95 95
msgid "Last 14 days"
96 96
msgstr "Last 14 days"
97 97

  
98
#: vigigraph/public/js/graph.js:35
98
#: vigigraph/public/js/graph.js:34
99 99
msgid "Last 3 months"
100 100
msgstr "Last 3 months"
101 101

  
102
#: vigigraph/public/js/graph.js:36
102
#: vigigraph/public/js/graph.js:35
103 103
msgid "Last 6 months"
104 104
msgstr "Last 6 months"
105 105

  
106
#: vigigraph/public/js/graph.js:41
106
#: vigigraph/public/js/graph.js:40
107 107
msgid "Timeframe"
108 108
msgstr "Timeframe"
109 109

  
110
#: vigigraph/public/js/graph.js:43
110
#: vigigraph/public/js/graph.js:42
111 111
msgid "Timeframe menu"
112 112
msgstr "Timeframe menu"
113 113

  
114
#: vigigraph/public/js/graph.js:59
114
#: vigigraph/public/js/graph.js:58
115 115
msgid "Export to CSV"
116 116
msgstr "Export to CSV"
117 117

  
118
#: vigigraph/public/js/graph.js:61
118
#: vigigraph/public/js/graph.js:60
119 119
msgid "Export the content of this graph to CSV"
120 120
msgstr "Export the content of this graph to CSV"
121 121

  
122
#: vigigraph/public/js/graph.js:76
122
#: vigigraph/public/js/graph.js:75
123 123
msgid "All"
124 124
msgstr "All"
125 125

  
126
#: vigigraph/public/js/graph.js:88
126
#: vigigraph/public/js/graph.js:87
127 127
msgid "Automatically refresh the graph"
128 128
msgstr "Automatically refresh the graph"
129 129

  
130
#: vigigraph/public/js/graph.js:114
130
#: vigigraph/public/js/graph.js:113
131 131
msgid "Graph start"
132 132
msgstr "Graph start"
133 133

  
134
#: vigigraph/public/js/graph.js:122
134
#: vigigraph/public/js/graph.js:121
135 135
msgid "Previous section"
136 136
msgstr "Previous section"
137 137

  
138
#: vigigraph/public/js/graph.js:130
138
#: vigigraph/public/js/graph.js:129
139 139
msgid "Next section"
140 140
msgstr "Next section"
141 141

  
142
#: vigigraph/public/js/graph.js:138
142
#: vigigraph/public/js/graph.js:137
143 143
msgid "Graph end"
144 144
msgstr "Graph end"
145 145

  
146
#: vigigraph/public/js/graph.js:146
146
#: vigigraph/public/js/graph.js:145
147 147
msgid "Zoom in"
148 148
msgstr "Zoom in"
149 149

  
150
#: vigigraph/public/js/graph.js:156
150
#: vigigraph/public/js/graph.js:155
151 151
msgid "Zoom out"
152 152
msgstr "Zoom out"
153 153

  
154
#: vigigraph/public/js/graph.js:165
154
#: vigigraph/public/js/graph.js:164
155 155
msgid "Print graph"
156 156
msgstr "Print graph"
157 157

  
158
#: vigigraph/public/js/graph.js:170
158
#: vigigraph/public/js/graph.js:169
159 159
#, python-format
160 160
msgid "Graph for \"%(graph)s\" on \"%(host)s\""
161 161
msgstr "Graph for \"%(graph)s\" on \"%(host)s\""
162 162

  
163
#: vigigraph/public/js/graph.js:308
163
#: vigigraph/public/js/graph.js:307
164 164
#, python-format
165 165
msgid ""
166 166
"Could not load the graph for \"%(graph)s\" on \"%(host)s\".\n"
vigigraph/i18n/fr/LC_MESSAGES/vigigraph.po
8 8
"Project-Id-Version: vigigraph 0.1\n"
9 9
"Report-Msgid-Bugs-To: contact@projet-vigilo.org\n"
10 10
"POT-Creation-Date: 2010-02-15 13:41+0100\n"
11
"PO-Revision-Date: 2010-11-17 13:47+0100\n"
11
"PO-Revision-Date: 2010-11-17 17:44+0100\n"
12 12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13
"Language-Team: fr_FR <LL@li.org>\n"
14 14
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
......
65 65
msgid "Last %d months"
66 66
msgstr "Les %d derniers mois"
67 67

  
68
#: vigigraph/controllers/rpc.py:68 vigigraph/public/js/graph.js:37
68
#: vigigraph/controllers/rpc.py:68 vigigraph/public/js/graph.js:36
69 69
msgid "Last year"
70 70
msgstr "L'an dernier"
71 71

  
72 72
#. TRANSLATORS: Format Python de date/heure, lisible par un humain.
73
#: vigigraph/controllers/rpc.py:201
73
#: vigigraph/controllers/rpc.py:200
74 74
#, python-format
75 75
msgid "%a, %d %b %Y %H:%M:%S"
76 76
msgstr "%d/%m/%Y à %H:%M:%S"
77 77

  
78
#: vigigraph/public/js/graph.js:30
78
#: vigigraph/public/js/graph.js:29
79 79
msgid "Last 12 hours"
80 80
msgstr "12 dernières heures"
81 81

  
82
#: vigigraph/public/js/graph.js:31
82
#: vigigraph/public/js/graph.js:30
83 83
msgid "Last 24 hours"
84 84
msgstr "24 dernières heures"
85 85

  
86
#: vigigraph/public/js/graph.js:32
86
#: vigigraph/public/js/graph.js:31
87 87
msgid "Last 48 hours"
88 88
msgstr "48 dernières heures"
89 89

  
90
#: vigigraph/public/js/graph.js:33
90
#: vigigraph/public/js/graph.js:32
91 91
msgid "Last 7 days"
92 92
msgstr "7 derniers jours"
93 93

  
94
#: vigigraph/public/js/graph.js:34
94
#: vigigraph/public/js/graph.js:33
95 95
msgid "Last 14 days"
96 96
msgstr "14 derniers jours"
97 97

  
98
#: vigigraph/public/js/graph.js:35
98
#: vigigraph/public/js/graph.js:34
99 99
msgid "Last 3 months"
100 100
msgstr "3 derniers mois"
101 101

  
102
#: vigigraph/public/js/graph.js:36
102
#: vigigraph/public/js/graph.js:35
103 103
msgid "Last 6 months"
104 104
msgstr "6 derniers mois"
105 105

  
106
#: vigigraph/public/js/graph.js:41
106
#: vigigraph/public/js/graph.js:40
107 107
msgid "Timeframe"
108 108
msgstr "Période"
109 109

  
110
#: vigigraph/public/js/graph.js:43
110
#: vigigraph/public/js/graph.js:42
111 111
msgid "Timeframe menu"
112 112
msgstr "Menu de choix de la période"
113 113

  
114
#: vigigraph/public/js/graph.js:59
114
#: vigigraph/public/js/graph.js:58
115 115
msgid "Export to CSV"
116 116
msgstr "Export CSV"
117 117

  
118
#: vigigraph/public/js/graph.js:61
118
#: vigigraph/public/js/graph.js:60
119 119
msgid "Export the content of this graph to CSV"
120 120
msgstr "Exporte le contenu du graphe au format CSV"
121 121

  
122
#: vigigraph/public/js/graph.js:76
122
#: vigigraph/public/js/graph.js:75
123 123
msgid "All"
124 124
msgstr "Tous"
125 125

  
126
#: vigigraph/public/js/graph.js:88
126
#: vigigraph/public/js/graph.js:87
127 127
msgid "Automatically refresh the graph"
128 128
msgstr "Rafraîchissement automatique du graphe"
129 129

  
130
#: vigigraph/public/js/graph.js:114
130
#: vigigraph/public/js/graph.js:113
131 131
msgid "Graph start"
132 132
msgstr "Début du graphe"
133 133

  
134
#: vigigraph/public/js/graph.js:122
134
#: vigigraph/public/js/graph.js:121
135 135
msgid "Previous section"
136 136
msgstr "Section précédente"
137 137

  
138
#: vigigraph/public/js/graph.js:130
138
#: vigigraph/public/js/graph.js:129
139 139
msgid "Next section"
140 140
msgstr "Section suivante"
141 141

  
142
#: vigigraph/public/js/graph.js:138
142
#: vigigraph/public/js/graph.js:137
143 143
msgid "Graph end"
144 144
msgstr "Fin du graphe"
145 145

  
146
#: vigigraph/public/js/graph.js:146
146
#: vigigraph/public/js/graph.js:145
147 147
msgid "Zoom in"
148 148
msgstr "Zoomer"
149 149

  
150
#: vigigraph/public/js/graph.js:156
150
#: vigigraph/public/js/graph.js:155
151 151
msgid "Zoom out"
152 152
msgstr "Dézoomer"
153 153

  
154
#: vigigraph/public/js/graph.js:165
154
#: vigigraph/public/js/graph.js:164
155 155
msgid "Print graph"
156 156
msgstr "Imprimer le graphe"
157 157

  
158
#: vigigraph/public/js/graph.js:170
158
#: vigigraph/public/js/graph.js:169
159 159
#, python-format
160 160
msgid "Graph for \"%(graph)s\" on \"%(host)s\""
161 161
msgstr "Graphe pour \"%(graph)s\" sur \"%(host)s\""
162 162

  
163
#: vigigraph/public/js/graph.js:308
163
#: vigigraph/public/js/graph.js:307
164 164
#, python-format
165 165
msgid ""
166 166
"Could not load the graph for \"%(graph)s\" on \"%(host)s\".\n"
167 167
"Make sure VigiRRD is running and receives performance data."
168 168
msgstr ""
169 169
"Impossible de charger le graphe pour \"%(graph)s\" sur \"%(host)s\"\n"
170
"Assurez-vous que VigiRRD fonctionne et qu'il reçoit des données "
171
"de métrologie."
170
"Assurez-vous que VigiRRD fonctionne et qu'il reçoit des données de "
171
"métrologie."
172 172

  
173 173
#: vigigraph/public/js/toolbar.js:39
174 174
msgid "Globally change auto-refresh setting"
......
213 213
#: vigigraph/public/js/toolbar.js:115
214 214
msgid "Display the contents of the selected graph"
215 215
msgstr "Affiche le contenu du graphe sélectionné"
216

  
vigigraph/i18n/vigigraph.pot
8 8
msgstr ""
9 9
"Project-Id-Version: vigigraph 2.0.0\n"
10 10
"Report-Msgid-Bugs-To: contact@projet-vigilo.org\n"
11
"POT-Creation-Date: 2010-11-17 13:47+0100\n"
11
"POT-Creation-Date: 2010-11-17 17:44+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"
......
65 65
msgid "Last %d months"
66 66
msgstr ""
67 67

  
68
#: vigigraph/controllers/rpc.py:68 vigigraph/public/js/graph.js:37
68
#: vigigraph/controllers/rpc.py:68 vigigraph/public/js/graph.js:36
69 69
msgid "Last year"
70 70
msgstr ""
71 71

  
72 72
#. TRANSLATORS: Format Python de date/heure, lisible par un humain.
73
#: vigigraph/controllers/rpc.py:201
73
#: vigigraph/controllers/rpc.py:200
74 74
#, python-format
75 75
msgid "%a, %d %b %Y %H:%M:%S"
76 76
msgstr ""
77 77

  
78
#: vigigraph/public/js/graph.js:30
78
#: vigigraph/public/js/graph.js:29
79 79
msgid "Last 12 hours"
80 80
msgstr ""
81 81

  
82
#: vigigraph/public/js/graph.js:31
82
#: vigigraph/public/js/graph.js:30
83 83
msgid "Last 24 hours"
84 84
msgstr ""
85 85

  
86
#: vigigraph/public/js/graph.js:32
86
#: vigigraph/public/js/graph.js:31
87 87
msgid "Last 48 hours"
88 88
msgstr ""
89 89

  
90
#: vigigraph/public/js/graph.js:33
90
#: vigigraph/public/js/graph.js:32
91 91
msgid "Last 7 days"
92 92
msgstr ""
93 93

  
94
#: vigigraph/public/js/graph.js:34
94
#: vigigraph/public/js/graph.js:33
95 95
msgid "Last 14 days"
96 96
msgstr ""
97 97

  
98
#: vigigraph/public/js/graph.js:35
98
#: vigigraph/public/js/graph.js:34
99 99
msgid "Last 3 months"
100 100
msgstr ""
101 101

  
102
#: vigigraph/public/js/graph.js:36
102
#: vigigraph/public/js/graph.js:35
103 103
msgid "Last 6 months"
104 104
msgstr ""
105 105

  
106
#: vigigraph/public/js/graph.js:41
106
#: vigigraph/public/js/graph.js:40
107 107
msgid "Timeframe"
108 108
msgstr ""
109 109

  
110
#: vigigraph/public/js/graph.js:43
110
#: vigigraph/public/js/graph.js:42
111 111
msgid "Timeframe menu"
112 112
msgstr ""
113 113

  
114
#: vigigraph/public/js/graph.js:59
114
#: vigigraph/public/js/graph.js:58
115 115
msgid "Export to CSV"
116 116
msgstr ""
117 117

  
118
#: vigigraph/public/js/graph.js:61
118
#: vigigraph/public/js/graph.js:60
119 119
msgid "Export the content of this graph to CSV"
120 120
msgstr ""
121 121

  
122
#: vigigraph/public/js/graph.js:76
122
#: vigigraph/public/js/graph.js:75
123 123
msgid "All"
124 124
msgstr ""
125 125

  
126
#: vigigraph/public/js/graph.js:88
126
#: vigigraph/public/js/graph.js:87
127 127
msgid "Automatically refresh the graph"
128 128
msgstr ""
129 129

  
130
#: vigigraph/public/js/graph.js:114
130
#: vigigraph/public/js/graph.js:113
131 131
msgid "Graph start"
132 132
msgstr ""
133 133

  
134
#: vigigraph/public/js/graph.js:122
134
#: vigigraph/public/js/graph.js:121
135 135
msgid "Previous section"
136 136
msgstr ""
137 137

  
138
#: vigigraph/public/js/graph.js:130
138
#: vigigraph/public/js/graph.js:129
139 139
msgid "Next section"
140 140
msgstr ""
141 141

  
142
#: vigigraph/public/js/graph.js:138
142
#: vigigraph/public/js/graph.js:137
143 143
msgid "Graph end"
144 144
msgstr ""
145 145

  
146
#: vigigraph/public/js/graph.js:146
146
#: vigigraph/public/js/graph.js:145
147 147
msgid "Zoom in"
148 148
msgstr ""
149 149

  
150
#: vigigraph/public/js/graph.js:156
150
#: vigigraph/public/js/graph.js:155
151 151
msgid "Zoom out"
152 152
msgstr ""
153 153

  
154
#: vigigraph/public/js/graph.js:165
154
#: vigigraph/public/js/graph.js:164
155 155
msgid "Print graph"
156 156
msgstr ""
157 157

  
158
#: vigigraph/public/js/graph.js:170
158
#: vigigraph/public/js/graph.js:169
159 159
#, python-format
160 160
msgid "Graph for \"%(graph)s\" on \"%(host)s\""
161 161
msgstr ""
162 162

  
163
#: vigigraph/public/js/graph.js:308
163
#: vigigraph/public/js/graph.js:307
164 164
#, python-format
165 165
msgid ""
166 166
"Could not load the graph for \"%(graph)s\" on \"%(host)s\".\n"

Also available in: Unified diff