Skip to content

Commit b6ca3f3

Browse files
pfzimpfzim
committed
Some fixes and improvements
1 parent ba423e5 commit b6ca3f3

File tree

5 files changed

+17
-15
lines changed

5 files changed

+17
-15
lines changed

‎install.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
<<<'EOT'
138138
CREATE TABLE `#DB_NAME#`.`w_runbooks_jobs_params` (
139139
`pid` int(10) unsigned NOT NULL,
140-
`guid` varchar(36) NOT NULL,
140+
`guid` varchar(64) NOT NULL,
141141
`value` varchar(4096) NOT NULL,
142142
PRIMARY KEY (`pid`, `guid`)
143143
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -146,7 +146,7 @@
146146
<<<'EOT'
147147
CREATE TABLE `#DB_NAME#`.`w_runbooks_params` (
148148
`pid` int(10) unsigned NOT NULL,
149-
`guid` varchar(36) NOT NULL,
149+
`guid` varchar(64) NOT NULL,
150150
`name` varchar(255) NOT NULL,
151151
`extra_data_json` varchar(4096) NOT NULL DEFAULT '',
152152
`flags` int(10) unsigned NOT NULL,
@@ -1742,7 +1742,7 @@ function f_remove_self(id)
17421742
<div class="form-group">
17431743
<label for="ldap_user" class="control-label col-sm-2">User:</label>
17441744
<div class="col-sm-5">
1745-
<input id="ldap_user" name="ldap_user" class="form-control" type="text" value="domain\user" />
1745+
<input id="ldap_user" name="ldap_user" class="form-control" type="text" value="domain\user" placeholder="domain\user" />
17461746
</div>
17471747
</div>
17481748
<div class="form-group">
@@ -1754,7 +1754,7 @@ function f_remove_self(id)
17541754
<div class="form-group">
17551755
<label for="ldap_base" class="control-label col-sm-2">Base DN:</label>
17561756
<div class="col-sm-5">
1757-
<input id="ldap_base" name="ldap_base" class="form-control" type="text" value="DC=company,DC=local" />
1757+
<input id="ldap_base" name="ldap_base" class="form-control" type="text" value="DC=company,DC=local" placeholder="DC=company,DC=local" />
17581758
</div>
17591759
</div>
17601760
<div class="form-group">
@@ -1777,7 +1777,7 @@ function f_remove_self(id)
17771777
<div class="form-group">
17781778
<label for="scorch_user" class="control-label col-sm-2">User:</label>
17791779
<div class="col-sm-5">
1780-
<input id="scorch_user" name="scorch_user" class="form-control" type="text" value="domain\user" />
1780+
<input id="scorch_user" name="scorch_user" class="form-control" type="text" value="domain\user" placeholder="domain\user" />
17811781
</div>
17821782
</div>
17831783
<div class="form-group">
@@ -1807,7 +1807,7 @@ function f_remove_self(id)
18071807
<div class="form-group">
18081808
<label for="scorch2022_user" class="control-label col-sm-2">User:</label>
18091809
<div class="col-sm-5">
1810-
<input id="scorch2022_user" name="scorch2022_user" class="form-control" type="text" value="domain\user" />
1810+
<input id="scorch2022_user" name="scorch2022_user" class="form-control" type="text" value="domain\user" placeholder="domain\user" />
18111811
</div>
18121812
</div>
18131813
<div class="form-group">
@@ -1972,13 +1972,13 @@ function f_remove_self(id)
19721972
<div class="form-group">
19731973
<label for="web_url" class="control-label col-sm-2">WebSCO URL (with trailing slash):</label>
19741974
<div class="col-sm-5">
1975-
<input id="web_url" name="web_url" class="form-control" type="text" value="<?php eh($web_url) ?>" />
1975+
<input id="web_url" name="web_url" class="form-control" type="text" value="<?php eh($web_url) ?>" placeholder="<?php eh($web_url) ?>" />
19761976
</div>
19771977
</div>
19781978
<div class="form-group">
19791979
<label for="pretty_links_base_path" class="control-label col-sm-2">Links base path (with leading and trailing slash):</label>
19801980
<div class="col-sm-5">
1981-
<input id="pretty_links_base_path" name="pretty_links_base_path" class="form-control" type="text" value="<?php eh($pretty_links_base_path) ?>" />
1981+
<input id="pretty_links_base_path" name="pretty_links_base_path" class="form-control" type="text" value="<?php eh($pretty_links_base_path) ?>" placeholder="<?php eh($pretty_links_base_path) ?>" />
19821982
</div>
19831983
</div>
19841984
<div class="form-group">
@@ -2008,7 +2008,7 @@ function f_remove_self(id)
20082008
<div class="form-group">
20092009
<label for="log_file" class="control-label col-sm-2">Log file:</label>
20102010
<div class="col-sm-5">
2011-
<input id="log_file" name="log_file" class="form-control" type="text" value="/var/log/websco/websco.log" />
2011+
<input id="log_file" name="log_file" class="form-control" type="text" value="/var/log/websco/websco.log" placeholder="/var/log/websco/websco.log" />
20122012
</div>
20132013
</div>
20142014
<div class="form-group">

‎modules/AnsibleAWX.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@ private function flags_to_type($flags)
827827
{
828828
switch($flags & (RBF_FIELD_TYPE_STRING | RBF_FIELD_TYPE_NUMBER | RBF_FIELD_TYPE_LIST | RBF_FIELD_TYPE_PASSWORD | RBF_FIELD_TYPE_FLAGS))
829829
{
830-
case RBF_FIELD_TYPE_NUMBER: return 'number';
830+
case RBF_FIELD_TYPE_NUMBER: return 'integer';
831831
case RBF_FIELD_TYPE_LIST: return 'list';
832832
case RBF_FIELD_TYPE_FLAGS: return 'multiselect';
833833
}

‎templates/tpl.header.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
<body>
2525
<ul class="menu-bar">
2626
<?php if($core->UserAuth->get_id()) { ?>
27-
<li><a href="<?php ln('runbooks') ?>"><?php L('Runbooks') ?></a></li>
27+
<li><a href="<?php ln('runbooks' . (isset($current_folder['id']) ? '/' . $current_folder['id'] .'/' : '')) ?>"><?php L('Runbooks') ?></a></li>
2828
<li><a href="<?php ln('tools') ?>"><?php L('Tools') ?></a></li>
29-
<li><a href="<?php ln('permissions') ?>"><?php L('Permissions') ?></a></li>
29+
<li><a href="<?php ln('permissions' . (isset($current_folder['id']) ? '/' . $current_folder['id'] .'/' : '')) ?>"><?php L('Permissions') ?></a></li>
3030
<li><a href="<?php ln('users') ?>"><?php L('Users') ?></a></li>
3131
<?php } ?>
3232
<ul style="float:right;list-style-type:none;">

‎upgrade.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,12 @@ function db_upgrade($core, $version, $message, $query)
149149
db_upgrade($core, 20, 'Add index for table `@runbooks_params`', rpv('ALTER TABLE `@runbooks_params` ADD INDEX idx_pid (`guid`)'));
150150
db_upgrade($core, 21, 'Add index for table `@runbooks_servers`', rpv('ALTER TABLE `@runbooks_servers` ADD INDEX idx_guid (`guid`)'));
151151
db_upgrade($core, 22, 'Update parent IDs in @runbooks_folders', rpv('UPDATE `@runbooks_folders` AS f LEFT JOIN `@runbooks_folders` AS parent ON f.`pid` = parent.`guid` SET f.`pid` = IFNULL(parent.`id`, 0), f.`name` = IF(f.`name` = \'\', \'(undefined folder name)\', f.`name`)'));
152-
db_upgrade($core, 23, 'Change `pid` column type in @runbooks_folders', rpv('ALTER TABLE `@runbooks_folders` MODIFY COLUMN `pid` INT(10) UNSIGNED NOT NULL'));
152+
db_upgrade($core, 23, 'Change `pid` column type in @runbooks_folders', rpv('ALTER TABLE `@runbooks_folders` MODIFY COLUMN `pid` int(10) UNSIGNED NOT NULL'));
153153
db_upgrade($core, 24, 'Update parent IDs in @runbooks_params', rpv('UPDATE `@runbooks_params` AS rp JOIN `@runbooks` AS r ON rp.`pid` = r.`guid` AND r.flags & # SET rp.`pid` = r.`id`', $runbook_type));
154-
db_upgrade($core, 25, 'Change `pid` column type in @runbooks_params', rpv('ALTER TABLE `@runbooks_params` MODIFY COLUMN `pid` INT(10) UNSIGNED NOT NULL'));
154+
db_upgrade($core, 25, 'Change `pid` column type in @runbooks_params', rpv('ALTER TABLE `@runbooks_params` MODIFY COLUMN `pid` int(10) UNSIGNED NOT NULL'));
155155
db_upgrade($core, 26, 'Add `extra_data_json` column to @runbooks_params', rpv('ALTER TABLE `@runbooks_params` ADD COLUMN `extra_data_json` VARCHAR(4096) NOT NULL DEFAULT \'\' AFTER `name`'));
156+
db_upgrade($core, 27, 'Extend `guid` column size in @runbooks_params', rpv('ALTER TABLE `@runbooks_params` MODIFY COLUMN `guid` varchar(64) NOT NULL'));
157+
db_upgrade($core, 28, 'Extend `guid` column size in @w_runbooks_jobs_params', rpv('ALTER TABLE `@w_runbooks_jobs_params` MODIFY COLUMN `guid` varchar(64) NOT NULL'));
156158

157159
if(defined('ORCHESTRATOR_VERSION') && (ORCHESTRATOR_VERSION == 2022) && !defined('ORCHESTRATOR2022_URL'))
158160
{

‎websco.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
*/
1919

20-
define('DB_VERSION', 26);
20+
define('DB_VERSION', 28);
2121
define('Z_PROTECTED', 'YES');
2222

2323
error_reporting(E_ALL);

0 commit comments

Comments
 (0)