Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d2f563b

Browse files
SKuipersSKuipers
committed
Update Form and Table class method names required, disabled, modal
1 parent 0c3d49e commit d2f563b

8 files changed

+26
-26
lines changed

‎Data Admin/duplication_combine.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
$row = $form->addRow();
7070
$row->addLabel('fieldName', __('Field Name'));
7171
$row->addSelect('fieldName')
72-
->isRequired()
72+
->required()
7373
->fromArray($fieldOptions)
7474
->chainedTo('tableName', $fieldChained)
7575
->selected($fieldName)

‎Data Admin/import_history.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
->addParam('gibbonLogID')
7575
->format(function ($importType, $actions) {
7676
$actions->addAction('view', __('View'))
77-
->isModal('600', '550')
77+
->modalWindow('600', '550')
7878
->setURL('/modules/Data Admin/import_history_view.php');
7979
});
8080

‎Data Admin/import_manage.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
->setURL('/modules/Data Admin/import_run.php');
9898

9999
$actions->addAction('export', __('Export Columns'))
100-
->isDirect()
100+
->directLink()
101101
->addParam('q', $_GET['q'])
102102
->addParam('data', 0)
103103
->setIcon('download')

‎Data Admin/import_run.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111

112112
$row = $form->addRow();
113113
$row->addLabel('mode', __('Mode'));
114-
$row->addSelect('mode')->fromArray($availableModes)->isRequired();
114+
$row->addSelect('mode')->fromArray($availableModes)->required();
115115

116116
$columnOrders = array(
117117
'guess' => __('Best Guess'),
@@ -122,19 +122,19 @@
122122
$selectedOrder = (!empty($importLog))? 'last' : 'guess';
123123
$row = $form->addRow();
124124
$row->addLabel('columnOrder', __('Column Order'));
125-
$row->addSelect('columnOrder')->fromArray($columnOrders)->isRequired()->selected($selectedOrder);
125+
$row->addSelect('columnOrder')->fromArray($columnOrders)->required()->selected($selectedOrder);
126126

127127
$row = $form->addRow();
128128
$row->addLabel('file', __('File'))->description(__('See Notes below for specification.'));
129-
$row->addFileUpload('file')->isRequired()->accepts('.csv,.xls,.xlsx,.xml,.ods');
129+
$row->addFileUpload('file')->required()->accepts('.csv,.xls,.xlsx,.xml,.ods');
130130

131131
$row = $form->addRow();
132132
$row->addLabel('fieldDelimiter', __('Field Delimiter'));
133-
$row->addTextField('fieldDelimiter')->isRequired()->maxLength(1)->setValue(',');
133+
$row->addTextField('fieldDelimiter')->required()->maxLength(1)->setValue(',');
134134

135135
$row = $form->addRow();
136136
$row->addLabel('stringEnclosure', __('String Enclosure'));
137-
$row->addTextField('stringEnclosure')->isRequired()->maxLength(1)->setValue('"');
137+
$row->addTextField('stringEnclosure')->required()->maxLength(1)->setValue('"');
138138

139139
$row = $form->addRow();
140140
$row->addFooter();
@@ -170,7 +170,7 @@
170170
->addParam('type', $type)
171171
->addParam('sidebar', 'false')
172172
->setIcon('download')
173-
->isDirect()
173+
->directLink()
174174
->displayLabel();
175175
}
176176

@@ -261,7 +261,7 @@
261261
->fromArray($headings)
262262
->selected($lastColumnValue)
263263
->placeholder()
264-
->isRequired();
264+
->required();
265265
}
266266

267267
$form->addRow()->addContent(' ');
@@ -351,15 +351,15 @@
351351
->setID('columnOrder'.$count)
352352
->fromArray($defaultColumns($fieldName))
353353
->fromArray($columns)
354-
->isRequired()
354+
->required()
355355
->setClass('columnOrder mediumWidth')
356356
->selected($selectedColumn)
357357
->placeholder();
358358
$row->addTextField('columnText['.$count.']')
359359
->setID('columnText'.$count)
360360
->setClass('shortWidth columnText')
361361
->readonly()
362-
->isDisabled();
362+
->disabled();
363363

364364
$count++;
365365
}
@@ -518,7 +518,7 @@
518518
$row->onlyIf($overallSuccess)->addContent('');
519519

520520
if (!$overallSuccess && !$ignoreErrors) {
521-
$row->addButton(__('Cannot Continue'))->setID('submitStep3')->isDisabled()->addClass('right');
521+
$row->addButton(__('Cannot Continue'))->setID('submitStep3')->disabled()->addClass('right');
522522
} else {
523523
$row->addSubmit()->setID('submitStep3');
524524
}

‎Data Admin/settings.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,12 @@
167167
$setting = getSettingByScope($connection2, 'Data Admin', 'importCustomFolderLocation', true);
168168
$row = $form->addRow();
169169
$row->addLabel($setting['name'], __($setting['nameDisplay']))->description($setting['description']);
170-
$row->addTextField($setting['name'])->isRequired()->setValue($setting['value']);
170+
$row->addTextField($setting['name'])->required()->setValue($setting['value']);
171171

172172
$setting = getSettingByScope($connection2, 'Data Admin', 'exportSnapshotsFolderLocation', true);
173173
$row = $form->addRow();
174174
$row->addLabel($setting['name'], __($setting['nameDisplay']))->description($setting['description']);
175-
$row->addTextField($setting['name'])->isRequired()->setValue($setting['value']);
175+
$row->addTextField($setting['name'])->required()->setValue($setting['value']);
176176

177177
$row = $form->addRow();
178178
$row->addFooter();

‎Data Admin/snapshot_manage_load.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
$row = $form->addRow();
7676
$row->addLabel('confirm', sprintf(__('Type %1$s to confirm'), __('CONFIRM')));
7777
$row->addTextField('confirm')
78-
->isRequired()
78+
->required()
7979
->addValidation(
8080
'Validate.Inclusion',
8181
'within: [\'' . __('CONFIRM') . '\'], failureMessage: "' . __('Please enter the text exactly as it is displayed to confirm this action.') . '", caseSensitive: false'

‎Data Admin/tools_findUsernames.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@
6363

6464
$row = $form->addRow();
6565
$row->addLabel('file', __('Spreadsheet'));
66-
$row->addFileUpload('file')->isRequired()->accepts('.csv,.xls,.xlsx,.xml,.ods');
66+
$row->addFileUpload('file')->required()->accepts('.csv,.xls,.xlsx,.xml,.ods');
6767

6868
$sql = "SELECT DISTINCT category AS value, category AS name FROM gibbonRole ORDER BY category";
6969
$row = $form->addRow();
7070
$row->addLabel('roleCategory', __('Role Category'));
71-
$row->addSelect('roleCategory')->fromQuery($pdo, $sql)->isRequired()->placeholder();
71+
$row->addSelect('roleCategory')->fromQuery($pdo, $sql)->required()->placeholder();
7272

7373
// COLUMN OPTIONS
7474
$form->toggleVisibilityByClass('columnTypeOptions')->onSelect('roleCategory')->whenNot(__('Please select...'));
@@ -78,7 +78,7 @@
7878
);
7979
$row = $form->addRow()->addClass('columnTypeOptions');
8080
$row->addLabel('columnType', __('Columns'))->description(__('Are the first and surnames separated into columns, or all in one column?'));
81-
$row->addSelect('columnType')->fromArray($columnTypes)->isRequired()->placeholder();
81+
$row->addSelect('columnType')->fromArray($columnTypes)->required()->placeholder();
8282

8383
$form->toggleVisibilityByClass('oneColumnOptions')->onSelect('columnType')->when('one');
8484
$form->toggleVisibilityByClass('multiColumnOptions')->onSelect('columnType')->when('multi');
@@ -91,31 +91,31 @@
9191
);
9292
$row = $form->addRow()->addClass('oneColumnOptions');
9393
$row->addLabel('nameFormat', __('Name Format'))->description(__('What format are the names currently in?'));
94-
$row->addSelect('nameFormat')->fromArray($formats)->isRequired()->placeholder();
94+
$row->addSelect('nameFormat')->fromArray($formats)->required()->placeholder();
9595

9696
$row = $form->addRow()->addClass('oneColumnOptions');
9797
$row->addLabel('nameColumn', __('Name Column'))->description(__('What column are the names in?'));
98-
$row->addSelect('nameColumn')->fromArray($columns)->isRequired()->placeholder();
98+
$row->addSelect('nameColumn')->fromArray($columns)->required()->placeholder();
9999

100100
// MULTIPLE COLUMNS
101101
$row = $form->addRow()->addClass('multiColumnOptions');
102102
$row->addLabel('nameColumn', __('Preferred Name Column'));
103-
$row->addSelect('nameColumn')->fromArray($columns)->isRequired()->placeholder();
103+
$row->addSelect('nameColumn')->fromArray($columns)->required()->placeholder();
104104

105105
$row = $form->addRow()->addClass('multiColumnOptions');
106106
$row->addLabel('firstNameColumn', __('First Name Column'))->description(__('Can be the same as preferred.'));
107-
$row->addSelect('firstNameColumn')->fromArray($columns)->isRequired()->placeholder();
107+
$row->addSelect('firstNameColumn')->fromArray($columns)->required()->placeholder();
108108

109109
$row = $form->addRow()->addClass('multiColumnOptions');
110110
$row->addLabel('surnameColumn', __('Surname Column'));
111-
$row->addSelect('surnameColumn')->fromArray($columns)->isRequired()->placeholder();
111+
$row->addSelect('surnameColumn')->fromArray($columns)->required()->placeholder();
112112

113113
// STUDENT YEAR GROUP
114114
$form->toggleVisibilityByClass('yearGroupOptions')->onSelect('roleCategory')->when('Student');
115115

116116
$row = $form->addRow()->addClass('yearGroupOptions');
117117
$row->addLabel('yearGroupColumn', __('Year Group Column'))->description(__('Only students with the same name AND same year group will be matched.'));
118-
$row->addSelect('yearGroupColumn')->fromArray($columns)->isRequired()->placeholder();
118+
$row->addSelect('yearGroupColumn')->fromArray($columns)->required()->placeholder();
119119

120120
$row = $form->addRow();
121121
$row->addFooter();

‎Data Admin/tools_findUsernamesProcess.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
exit;
4646
} else {
4747
// Include PHPExcel
48-
require_once $_SESSION[$guid]["absolutePath"] . '/lib/PHPExcel/Classes/PHPExcel.php';
48+
// require_once $_SESSION[$guid]["absolutePath"] . '/lib/PHPExcel/Classes/PHPExcel.php';
4949

5050
try {
5151
$objPHPExcel = \PHPExcel_IOFactory::load($filePath);

0 commit comments

Comments
 (0)