Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pour le select prenez pas la bonne valeur pour faire la comparaison donc il faut prendre la 2éme valeur #2666

Closed
wants to merge 103 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
dcfc557
Merge pull request #2188 from jeedom/alpha
Mar 29, 2023
1e7b805
Merge pull request #2189 from jeedom/alpha
Mar 30, 2023
2462b28
Merge pull request #2190 from jeedom/alpha
Mar 31, 2023
a33856d
Merge pull request #2192 from jeedom/alpha
Apr 6, 2023
d8453de
access public folders recursively
Salvialf Apr 18, 2023
bd8b189
Merge pull request #2202 from jeedom/alpha
Apr 20, 2023
a58c855
Merge pull request #2207 from jeedom/alpha
Apr 24, 2023
80c247b
Merge pull request #2209 from jeedom/alpha
Apr 25, 2023
19f20f5
Update lunaWizard.json
rocket13011 May 2, 2023
081302c
Update atlasWizard.json
rocket13011 May 2, 2023
dc2b2d1
Merge pull request #2211 from jeedom/alpha
May 4, 2023
67bd19e
Merge pull request #2216 from jeedom/alpha
May 10, 2023
812c4d4
Merge pull request #2223 from jeedom/alpha
May 22, 2023
59b6098
Merge pull request #2227 from jeedom/alpha
May 31, 2023
9cd87e2
Merge pull request #2231 from jeedom/alpha
Jun 5, 2023
6defc17
clean output buffer
Salvialf Jun 7, 2023
350e78c
Merge pull request #2235 from jeedom/alpha
Jun 8, 2023
c3b59d6
Merge pull request #2237 from jeedom/alpha
Jun 20, 2023
f1918d5
Merge pull request #2238 from jeedom/alpha
Jun 21, 2023
3e69a01
Merge pull request #2242 from jeedom/alpha
Jul 10, 2023
26bb13e
Merge pull request #2243 from jeedom/alpha
Jul 11, 2023
cdf8b27
Merge pull request #2251 from jeedom/alpha
Jul 15, 2023
f4de68b
Merge pull request #2252 from jeedom/alpha
Jul 20, 2023
b066a5c
Merge pull request #2253 from jeedom/alpha
Jul 20, 2023
257fbec
Merge pull request #2254 from jeedom/alpha
Jul 20, 2023
e1bca93
Merge pull request #2255 from jeedom/alpha
Jul 20, 2023
11a93c6
Merge pull request #2257 from jeedom/alpha
Jul 25, 2023
faa1d8e
Merge pull request #2258 from jeedom/alpha
Jul 25, 2023
d4bc668
Merge pull request #2259 from jeedom/alpha
Jul 25, 2023
10b84b1
Merge pull request #2261 from jeedom/alpha
Jul 25, 2023
289c85e
Update docker-image-latest.yml
Jul 25, 2023
68e0555
Merge pull request #2264 from jeedom/alpha
Jul 26, 2023
6b12140
Merge pull request #2265 from jeedom/alpha
Jul 26, 2023
f0c7bc6
Merge pull request #2266 from jeedom/alpha
Jul 26, 2023
fff05ef
Update docker-image-latest.yml
Jul 26, 2023
9cde081
Update docker-image-latest.yml
Jul 26, 2023
a9c5163
Merge pull request #2274 from jeedom/alpha
zoic21 Aug 20, 2023
36b595f
Merge pull request #2276 from jeedom/alpha
zoic21 Aug 21, 2023
d7cf93e
Merge pull request #2277 from jeedom/alpha
zoic21 Aug 23, 2023
bcdbf23
Merge pull request #2278 from jeedom/alpha
zoic21 Aug 24, 2023
0be55d0
Merge pull request #2279 from jeedom/alpha
zoic21 Aug 24, 2023
9758b7b
Merge pull request #2280 from jeedom/alpha
zoic21 Aug 24, 2023
f28b18d
Merge pull request #2281 from jeedom/alpha
zoic21 Aug 25, 2023
eb70e39
Merge pull request #2287 from jeedom/alpha
zoic21 Sep 11, 2023
b19d680
Merge pull request #2288 from jeedom/alpha
zoic21 Sep 11, 2023
7bc828b
Merge pull request #2291 from jeedom/alpha
zoic21 Sep 14, 2023
8e04b18
Merge pull request #2296 from jeedom/alpha
zoic21 Sep 30, 2023
ce714b5
Add jeedom.history.getLast
tysauron Oct 4, 2023
f9603f5
Add jeedom.history.getLast
tysauron Oct 4, 2023
77b63f1
Merge pull request #2307 from tysauron/beta
zoic21 Oct 5, 2023
6e75564
Revert "Add jeedom.history.getLast function"
zoic21 Oct 5, 2023
6e48769
Merge pull request #2308 from jeedom/revert-2307-beta
zoic21 Oct 5, 2023
be24b45
Merge pull request #2310 from jeedom/alpha
zoic21 Oct 5, 2023
a62adb9
Update install_nodejs.sh
NebzHB Oct 19, 2023
e59d0d9
Merge pull request #2316 from jeedom/alpha
zoic21 Oct 19, 2023
b3b2c2c
Merge pull request #2315 from NebzHB/patch-7
zoic21 Oct 19, 2023
238eebb
Update NodeJS installation method (old is depreciated)
NebzHB Oct 23, 2023
df422eb
Merge pull request #2318 from NebzHB/patch-9
zoic21 Oct 24, 2023
823bf6b
Merge pull request #2324 from jeedom/alpha
zoic21 Oct 31, 2023
35b9e11
Merge pull request #2325 from jeedom/alpha
zoic21 Nov 2, 2023
7eed0d9
Merge pull request #2326 from jeedom/alpha
zoic21 Nov 2, 2023
eb03a20
Merge pull request #2327 from jeedom/alpha
zoic21 Nov 2, 2023
ed5f8f8
Merge pull request #2328 from jeedom/alpha
zoic21 Nov 2, 2023
9be4fb9
Merge pull request #2335 from jeedom/alpha
zoic21 Nov 16, 2023
82c2cd8
Merge pull request #2337 from jeedom/alpha
zoic21 Nov 23, 2023
a7ec1c2
Merge pull request #2346 from jeedom/alpha
zoic21 Dec 4, 2023
657eaa0
Update lunaWizard.json
Sekiro-kost Dec 6, 2023
c1f5015
Update atlasWizard.json
Sekiro-kost Dec 6, 2023
ceacb65
Merge pull request #2359 from jeedom/alpha
zoic21 Dec 28, 2023
9dd10c6
Merge pull request #2360 from jeedom/alpha
zoic21 Dec 29, 2023
b917e9d
Merge pull request #2372 from jeedom/alpha
zoic21 Jan 17, 2024
c092af9
Merge pull request #2375 from jeedom/alpha
zoic21 Jan 18, 2024
f8e3381
add building ing for jeeasy
Sekiro-kost Jan 18, 2024
2325656
Merge pull request #2376 from jeedom/alpha
zoic21 Jan 19, 2024
ededcc3
Merge pull request #2378 from jeedom/alpha
zoic21 Jan 21, 2024
b7480b4
Merge pull request #2392 from jeedom/alpha
zoic21 Feb 7, 2024
5169910
Merge pull request #2393 from jeedom/alpha
zoic21 Feb 7, 2024
758d74c
Merge pull request #2399 from jeedom/alpha
zoic21 Feb 12, 2024
7cedfaa
Merge pull request #2402 from jeedom/alpha
zoic21 Feb 19, 2024
0175103
Merge pull request #2409 from jeedom/alpha
zoic21 Feb 28, 2024
cdd1cf9
fix zip and city fields
Salvialf Mar 2, 2024
ff9415c
zipcode as text
Salvialf Mar 2, 2024
a44e261
Merge pull request #2421 from jeedom/alpha
rocket13011 Mar 22, 2024
a4b133a
Merge pull request #2454 from jeedom/alpha
Salvialf Apr 3, 2024
ad3d13e
Merge pull request #2456 from jeedom/alpha
zoic21 Apr 4, 2024
c078027
Merge pull request #2458 from jeedom/alpha
zoic21 Apr 4, 2024
6a2e366
Merge pull request #2464 from jeedom/alpha
zoic21 Apr 5, 2024
478d06f
Merge pull request #2467 from jeedom/alpha
zoic21 Apr 5, 2024
1830690
Merge pull request #2487 from jeedom/alpha
zoic21 Apr 9, 2024
02b6ecc
Update utils.js
zoic21 Apr 9, 2024
dded788
Merge pull request #2516 from jeedom/alpha
Hotfirenet Apr 11, 2024
92b2be3
Merge pull request #2542 from jeedom/alpha
zoic21 Apr 17, 2024
e83a341
Merge pull request #2560 from jeedom/alpha
zoic21 Apr 23, 2024
f82f546
Merge pull request #2568 from jeedom/alpha
zoic21 Apr 23, 2024
d39b7f1
Merge pull request #2569 from jeedom/alpha
zoic21 Apr 24, 2024
e1688bc
Merge pull request #2604 from jeedom/alpha
zoic21 May 7, 2024
9466233
Merge pull request #2614 from jeedom/alpha
zoic21 May 7, 2024
fdf89e8
Pour le select prenez pas la bonne valeur pour faire la comparaison d…
shun84 Jun 1, 2024
fe10301
Merge branch 'jeedom:alpha' into alpha
shun84 Jun 1, 2024
d141226
Merge branch 'jeedom:alpha' into alpha
shun84 Jun 3, 2024
97c322c
Revert "Pour le select prenez pas la bonne valeur pour faire la compa…
shun84 Jun 3, 2024
ff6f05f
Pour le select prenez pas la bonne valeur pour faire la comparaison d…
shun84 Jun 3, 2024
e7c0fd6
Merge branch 'jeedom:alpha' into alpha
shun84 Jun 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/class/cmd.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -1658,7 +1658,7 @@ public function toHtml($_version = 'dashboard', $_options = '') {
$coupleArray = explode('|', $element);
$cmdValue = $this->getCmdValue();
if (is_object($cmdValue) && $cmdValue->getType() == 'info') {
if ($cmdValue->execCmd() == $coupleArray[0]) {
if ($cmdValue->execCmd() == $coupleArray[1]) {
$listOption .= '<option value="' . $coupleArray[0] . '" selected>' . $coupleArray[1] . '</option>';
$foundSelect = true;
} else {
Expand Down
31 changes: 21 additions & 10 deletions data/custom/atlasWizard.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"custom": "",
"visible": 1
},

"objects" : {

"title": "Pièces",
Expand All @@ -36,12 +36,14 @@
"visible": 1

},
"dnsGo" : {
"dnsGo" : {

"title": "OpenVPN",
"wizard": "dnsGo",
"order": 4,
"custom": "",
"visible": 1

},
"pack" :
{
Expand All @@ -60,7 +62,7 @@
"custom": "",
"visible": 1
}
,
,
"services" :
{
"title": "Services",
Expand All @@ -70,29 +72,38 @@
"visible": 1
}
,
"backupCloud" :
{
"title": "BackupCloud",
"wizard": "backupCloud",
"order": 8,
"custom": "",
"visible": 1
}
,
"assistants" :
{
"title": "Assistants Vocaux",
"wizard": "assistants",
"order": 8,
"order": 9,
"custom": "",
"visible": 1
}
,
"atlas" :
{
"title": "Options Atlas",
{
"title": "Options Atlas",
"wizard": "atlas",
"order": 9,
"order": 10,
"custom": "",
"visible": 1
}
}
,
"ready" :
{
"title": "Prêt à commencer",
"title": "Prêt à démarrer",
"wizard": "ready",
"order": 10,
"order": 11,
"custom": "",
"visible": 1
}
Expand Down
31 changes: 21 additions & 10 deletions data/custom/lunaWizard.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"custom": "",
"visible": 1
},

"objects" : {

"title": "Pièces",
Expand All @@ -36,12 +36,14 @@
"visible": 1

},
"dnsGo" : {
"dnsGo" : {

"title": "OpenVPN",
"wizard": "dnsGo",
"order": 4,
"custom": "",
"visible": 1

},
"pack" :
{
Expand All @@ -60,7 +62,7 @@
"custom": "",
"visible": 1
}
,
,
"services" :
{
"title": "Services",
Expand All @@ -70,29 +72,38 @@
"visible": 1
}
,
"backupCloud" :
{
"title": "BackupCloud",
"wizard": "backupCloud",
"order": 8,
"custom": "",
"visible": 1
}
,
"assistants" :
{
"title": "Assistants Vocaux",
"wizard": "assistants",
"order": 8,
"order": 9,
"custom": "",
"visible": 1
}
,
"luna" :
{
"title": "Options Luna",
{
"title": "Options Luna",
"wizard": "luna",
"order": 9,
"order": 10,
"custom": "",
"visible": 1
}
}
,
"ready" :
{
"title": "Prêt à commencer",
"title": "Prêt à démarrer",
"wizard": "ready",
"order": 10,
"order": 11,
"custom": "",
"visible": 1
}
Expand Down
Loading