Skip to content

Commit 141b102

Browse files
committed
Fixings
1 parent e2237a5 commit 141b102

14 files changed

Lines changed: 48 additions & 27 deletions

debian/changelog

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
icinga-editor (0.202-1) UNRELEASED; urgency=medium
1+
icinga-editor (0.202-5) UNRELEASED; urgency=medium
22

33
[ dvorak ]
44
* Initial release. (Closes: #XXXXXX)
@@ -80,5 +80,13 @@ icinga-editor (0.202-1) UNRELEASED; urgency=medium
8080
* typo fixes
8181
* Opravy formulare editace. Hlavne js autosave a nakladani s hodnotou
8282
NULL
83+
* All widgets on on command edit form gives you visual response about
84+
colum value save success.
85+
* All widgets on on command edit form gives you visual response about
86+
colum value save success.
87+
* All widgets on on command edit form gives you visual response about
88+
colum value save success.
89+
* All widgets on on command edit form gives you visual response about
90+
colum value save success.
8391

84-
-- vitex <vitex@developer.kancl.brevnov.czf> Thu, 21 Jul 2016 19:46:59 +0200
92+
-- vitex <vitex@developer.kancl.brevnov.czf> Mon, 25 Jul 2016 14:25:05 +0200

debian/conf/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "vitexsoftware/icinga-editor",
33
"description": "Editor of Icinga Configuration files (debian version)",
4-
"version": "0.202.1",
4+
"version": "0.202.5",
55
"authors": [
66
{
77
"name": "vitex",
@@ -14,7 +14,7 @@
1414
},
1515
"require": {
1616
"php": ">= 5.5.9",
17-
"vitexsoftware/ease-framework": "1.1-stable"
17+
"vitexsoftware/ease-framework": ">= 1.1.2"
1818
},
1919
"autoload": {
2020
"psr-4": {

debian/revison

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1
1+
5

nbproject/private/private.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
<group name="Monitoring">
1111
<file>file:/home/vitex/Projects/VitexSoftware/iciedit/src/includes/Configure.php</file>
1212
</group>
13-
<group>
14-
<file>file:/home/vitex/Projects/VitexSoftware/icinga_configurator/src/classes/engine/Configurator.php</file>
15-
</group>
13+
<group/>
1614
</open-files>
1715
</project-private>

src/classes/UI/BootstrapMenu.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public function draw()
7676
['id' => 'StatusMessages', 'class' => 'well', 'title' => _('kliknutím skryjete zprávy'),
7777
'data-state' => 'down']));
7878
$this->addItem(new \Ease\Html\Div(null, ['id' => 'smdrag']));
79+
$this->webPage->cleanMessages();
7980
}
8081
parent::draw();
8182
}

src/classes/UI/MainMenu.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,13 @@ private function changesButton($nav)
3333
if ($user->getSettingValue('unsaved') == true) {
3434
$nav->addMenuItem(
3535
new \Ease\TWB\LinkButton(
36-
'regenall.php', _('Přegenerovat všechny konfiguráky'),
37-
'warning'
36+
'regenall.php', _('Přegenerovat vše'), 'warning'
3837
), 'right'
3938
);
4039
} else {
4140
$nav->addMenuItem(
4241
new \Ease\TWB\LinkButton(
43-
'regenall.php', _('Přegenerovat všechny konfiguráky'),
44-
'default'
42+
'regenall.php', _('Přegenerovat vše'), 'default'
4543
), 'right'
4644
);
4745
}
@@ -301,4 +299,5 @@ public function finalize()
301299
\Ease\JQuery\Part::jQueryze($this);
302300
$this->includeJavaScript('js/slideupmessages.js');
303301
}
304-
}
302+
303+
}

src/classes/UI/ServiceConfigurator.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class ServiceConfigurator extends \Ease\Html\Div
1111
{
1212
/**
1313
* Objekt tweakeru
14-
* @var IEServiceTweaker
14+
* @var ServiceTweaker
1515
*/
1616
public $tweaker = null;
1717

@@ -31,11 +31,11 @@ class ServiceConfigurator extends \Ease\Html\Div
3131
* Položky vždy určené k tweakování
3232
* @var array
3333
*/
34-
public $commonFields = ['check_interval'];
34+
public $commonFields = ['check_interval', 'check_command-params'];
3535

3636
/**
3737
* Obecný modul pro konfiguraci služby
38-
* @param IEServiceTweaker $tweaker
38+
* @param ServiceTweaker $tweaker
3939
*/
4040
public function __construct($tweaker)
4141
{

src/classes/UI/ServiceTweaker.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ class ServiceTweaker extends \Ease\Html\Div
1111
{
1212
/**
1313
* Objekt příkazu
14-
* @var IECommand
14+
* @var \Icinga\Editor\Engine\Command
1515
*/
1616
public $command = null;
1717

1818
/**
1919
* Objekt služby
20-
* @var IEService
20+
* @var \Icinga\Editor\Engine\Service
2121
*/
2222
public $service = null;
2323

2424
/**
2525
* Objekt Hosta
26-
* @var IEHost
26+
* @var \Icinga\Editor\Engine\Host
2727
*/
2828
public $host = null;
2929

@@ -36,8 +36,8 @@ class ServiceTweaker extends \Ease\Html\Div
3636
/**
3737
* Umožňuje měnit parametry služeb
3838
*
39-
* @param IEService $service
40-
* @param IEHost $host ObjektHostu
39+
* @param \Icinga\Editor\Engine\Service $service
40+
* @param \Icinga\Editor\Engine\Host $host ObjektHostu
4141
*/
4242
public function __construct($service, $host)
4343
{

src/classes/UI/ServiceWizardForm.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ function finalize()
5858
$this->addInput(new UserSelect('user_id', null,
5959
$this->service->getDataValue('user_id'))
6060
, _('Vlastnik'));
61+
62+
$this->addInput(new YesNoSwitch('autocfg', false, 1),
63+
_('Nabizet konfiguracni dialog'));
6164
} else {
6265
$this->addItem(new \Ease\Html\InputHiddenTag('user_id',
6366
$user->getUserID()));

src/classes/UI/TWBSwitch.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function finalize()
4343
\Ease\TWB\Part::twBootstrapize();
4444
$this->includeCss('/javascript/twitter-bootstrap/css/bootstrap-switch.css');
4545
$this->includeJavascript('/javascript/twitter-bootstrap/js/bootstrap-switch.js');
46-
$this->addJavascript('$("[name=\''.$this->getTagName().'\']").bootstrapSwitch({'.\Ease\TWB\Part::partPropertiesToString($this->properties).'})',
46+
$this->addJavascript('$("[name=\''.$this->getTagName().'\']").bootstrapSwitch('.json_encode($this->properties).')',
4747
null, true);
4848
}
4949
}

0 commit comments

Comments
 (0)