-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6 from Galamoon/master
Релиз на marketplace.bitrix.ru [v0.7.1]
- Loading branch information
Showing
110 changed files
with
5,620 additions
and
3,313 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,120 +1,120 @@ | ||
| <?php | ||
| require_once($_SERVER["DOCUMENT_ROOT"] . "/bitrix/modules/main/include/prolog_admin_before.php"); | ||
|
|
||
| use Bitrix\Main\Loader; | ||
| use Bitrix\Main\Localization\Loc; | ||
| use Ylab\Ddata\LoadUnits; | ||
|
|
||
| try { | ||
| define('MODULE_ID', 'ylab.ddata'); | ||
| Loader::includeModule(MODULE_ID); | ||
|
|
||
| Loc::loadMessages(__FILE__); | ||
| $ctx = \Bitrix\Main\Application::getInstance()->getContext(); | ||
| $request = $ctx->getRequest(); | ||
| $sGeneratorID = $request->get('generator'); | ||
| $sFieldID = $request->get('field'); | ||
| $sPropertyName = $request->get('property-name'); | ||
| $sProfileID = $request->get('profile_id'); | ||
| $arRequest = $request->toArray(); | ||
| $arOptions = $arRequest['option']; | ||
|
|
||
| $objLoadUnits = new LoadUnits(); | ||
| $arDataUnits = $objLoadUnits->getDataUnits(); | ||
| foreach ($arDataUnits as $arData) { | ||
| if ($arData['ID'] == $sGeneratorID) { | ||
| $arDataForm = $arData; | ||
| break; | ||
| } | ||
| } | ||
| $sDataClass = $arDataForm['CLASS']; | ||
| $sForm = $sDataClass::getOptionForm($request); | ||
|
|
||
| $isValidateOptions = false; | ||
| if ($request->isPost() && !empty($request->get('validate'))) { | ||
| $isValidateOptions = $sDataClass::isValidateOptions($request); | ||
| if (!$isValidateOptions) { | ||
| throw new Exception(Loc::getMessage('ERROR_OPTION')); | ||
| } | ||
| } | ||
|
|
||
| } catch (\Exception $e) { | ||
| $error = $e->getMessage(); | ||
| } | ||
|
|
||
| if (isset($error)) { | ||
| CAdminMessage::ShowMessage([ | ||
| "MESSAGE" => $error, | ||
| "TYPE" => "ERROR", | ||
| ]); | ||
| } | ||
|
|
||
| if (!empty($sForm) && !$isValidateOptions) { ?> | ||
| <form action="<?= $APPLICATION->GetCurPage() ?>" method='post' name="WindowEntityDataForm" id='WindowEntityDataForm'> | ||
| <?= $sForm ?> | ||
| <script type="text/javascript"> | ||
| var saveBtn = { | ||
| title: "<?= Loc::getMessage('YLAB_DDATA_BTN_JS_SAVE')?>", | ||
| id: "savebtn", | ||
| name: "savebtn", | ||
| className: "adm-btn-save", | ||
| action: function () { | ||
| window.YlabDdata.WindowEntityDataForm.PostParameters("validate=Y"); | ||
| } | ||
| }; | ||
| window.YlabDdata.WindowEntityDataForm.SetButtons([saveBtn, BX.CDialog.btnCancel]); | ||
| </script> | ||
| </form> | ||
| <? } else { ?> | ||
| <script> | ||
| BX.ready(function () { | ||
| var inputButton = BX.findChild( | ||
| BX(document), | ||
| { | ||
| className: 'DataFieldButton', | ||
| attribute: { | ||
| 'data-name': '<?= $sPropertyName ?>' | ||
| } | ||
| }, | ||
| true, | ||
| true | ||
| )[0]; | ||
| var inputOptions = BX.findChild( | ||
| BX(document), | ||
| { | ||
| attribute: { | ||
| 'name': '<?= $sPropertyName ?>[<?= $sGeneratorID ?>]' | ||
| } | ||
| }, | ||
| true, | ||
| true | ||
| )[0]; | ||
| if (inputOptions == undefined) { | ||
| BX.prepend(BX.create('input', { | ||
| attrs: { | ||
| 'type': 'hidden', | ||
| 'class': 'options-input', | ||
| 'name': '<?= $sPropertyName ?>[<?= $sGeneratorID ?>]', | ||
| 'value': '<?= json_encode($arOptions) ?>', | ||
| 'id': '<?= $sGeneratorID ?>' | ||
| } | ||
| }), BX.findParent(inputButton, {})); | ||
| } else { | ||
|
|
||
| BX.remove(inputOptions); | ||
|
|
||
| BX.prepend(BX.create('input', { | ||
| attrs: { | ||
| 'type': 'hidden', | ||
| 'class': 'options-input', | ||
| 'name': '<?= $sPropertyName ?>[<?= $sGeneratorID ?>]', | ||
| 'value': '<?= json_encode($arOptions) ?>', | ||
| 'id': '<?= $sGeneratorID ?>' | ||
| } | ||
| }), BX.findParent(inputButton, {})); | ||
| } | ||
| }); | ||
| window.YlabDdata.WindowEntityDataForm.Close(); | ||
| </script> | ||
| <? } ?> | ||
|
|
||
| <?php | ||
| require_once($_SERVER["DOCUMENT_ROOT"] . "/bitrix/modules/main/include/prolog_admin_before.php"); | ||
|
|
||
| use Bitrix\Main\Loader; | ||
| use Bitrix\Main\Localization\Loc; | ||
| use Ylab\Ddata\LoadUnits; | ||
|
|
||
| try { | ||
| define('MODULE_ID', 'ylab.ddata'); | ||
| Loader::includeModule(MODULE_ID); | ||
|
|
||
| Loc::loadMessages(__FILE__); | ||
| $ctx = \Bitrix\Main\Application::getInstance()->getContext(); | ||
| $request = $ctx->getRequest(); | ||
| $sGeneratorID = $request->get('generator'); | ||
| $sFieldID = $request->get('field'); | ||
| $sPropertyName = $request->get('property-name'); | ||
| $sProfileID = $request->get('profile_id'); | ||
| $arRequest = $request->toArray(); | ||
| $arOptions = $arRequest['option']; | ||
|
|
||
| $objLoadUnits = new LoadUnits(); | ||
| $arDataUnits = $objLoadUnits->getDataUnits(); | ||
| foreach ($arDataUnits as $arData) { | ||
| if ($arData['ID'] == $sGeneratorID) { | ||
| $arDataForm = $arData; | ||
| break; | ||
| } | ||
| } | ||
| $sDataClass = $arDataForm['CLASS']; | ||
| $sForm = $sDataClass::getOptionForm($request); | ||
|
|
||
| $isValidateOptions = false; | ||
| if ($request->isPost() && !empty($request->get('validate'))) { | ||
| $isValidateOptions = $sDataClass::isValidateOptions($request); | ||
| if (!$isValidateOptions) { | ||
| throw new Exception(Loc::getMessage('ERROR_OPTION')); | ||
| } | ||
| } | ||
|
|
||
| } catch (\Exception $e) { | ||
| $error = $e->getMessage(); | ||
| } | ||
|
|
||
| if (isset($error)) { | ||
| CAdminMessage::ShowMessage([ | ||
| "MESSAGE" => $error, | ||
| "TYPE" => "ERROR", | ||
| ]); | ||
| } | ||
|
|
||
| if (!empty($sForm) && !$isValidateOptions) { ?> | ||
| <form action="<?= $APPLICATION->GetCurPage() ?>" method='post' name="WindowEntityDataForm" id='WindowEntityDataForm'> | ||
| <?= $sForm ?> | ||
| <script type="text/javascript"> | ||
| var saveBtn = { | ||
| title: "<?= Loc::getMessage('YLAB_DDATA_BTN_JS_SAVE')?>", | ||
| id: "savebtn", | ||
| name: "savebtn", | ||
| className: "adm-btn-save", | ||
| action: function () { | ||
| window.YlabDdata.WindowEntityDataForm.PostParameters("validate=Y"); | ||
| } | ||
| }; | ||
| window.YlabDdata.WindowEntityDataForm.SetButtons([saveBtn, BX.CDialog.btnCancel]); | ||
| </script> | ||
| </form> | ||
| <? } else { ?> | ||
| <script> | ||
| BX.ready(function () { | ||
| var inputButton = BX.findChild( | ||
| BX(document), | ||
| { | ||
| className: 'DataFieldButton', | ||
| attribute: { | ||
| 'data-name': '<?= $sPropertyName ?>' | ||
| } | ||
| }, | ||
| true, | ||
| true | ||
| )[0]; | ||
| var inputOptions = BX.findChild( | ||
| BX(document), | ||
| { | ||
| attribute: { | ||
| 'name': '<?= $sPropertyName ?>[<?= $sGeneratorID ?>]' | ||
| } | ||
| }, | ||
| true, | ||
| true | ||
| )[0]; | ||
| if (inputOptions == undefined) { | ||
| BX.prepend(BX.create('input', { | ||
| attrs: { | ||
| 'type': 'hidden', | ||
| 'class': 'options-input', | ||
| 'name': '<?= $sPropertyName ?>[<?= $sGeneratorID ?>]', | ||
| 'value': '<?= json_encode($arOptions) ?>', | ||
| 'id': '<?= $sGeneratorID ?>' | ||
| } | ||
| }), BX.findParent(inputButton, {})); | ||
| } else { | ||
|
|
||
| BX.remove(inputOptions); | ||
|
|
||
| BX.prepend(BX.create('input', { | ||
| attrs: { | ||
| 'type': 'hidden', | ||
| 'class': 'options-input', | ||
| 'name': '<?= $sPropertyName ?>[<?= $sGeneratorID ?>]', | ||
| 'value': '<?= json_encode($arOptions) ?>', | ||
| 'id': '<?= $sGeneratorID ?>' | ||
| } | ||
| }), BX.findParent(inputButton, {})); | ||
| } | ||
| }); | ||
| window.YlabDdata.WindowEntityDataForm.Close(); | ||
| </script> | ||
| <? } ?> | ||
Oops, something went wrong.