Skip to content

feat(dockerMan): add Save button to save template without recreating container or requiring authoring mode #2589

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.

Sign up for GitHub

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

Open
wandercone wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(dockerMan): add Save button to save template without recreating container or requiring authoring mode #2589

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,11 @@ function cpu_pinning() {
if (isset($_POST['contName'])) {
$postXML = postToXML($_POST, true);
$dry_run = isset($_POST['dryRun']) && $_POST['dryRun']=='true';
$save_only = isset($_POST['saveOnly']) && $_POST['saveOnly']=='true';
$existing = _var($_POST,'existingContainer',false);
$create_paths = $dry_run ? false : true;
$create_paths = ($dry_run || $save_only) ? false : true;
// Get the command line
[$cmd, $Name, $Repository] = xmlToCommand($postXML, $create_paths);
readfile("$docroot/plugins/dynamix.docker.manager/log.htm");
@flush();
// Saving the generated configuration file.
$userTmplDir = $dockerManPaths['templates-user'];
if (!is_dir($userTmplDir)) mkdir($userTmplDir, 0777, true);
Expand All @@ -93,6 +92,13 @@ function cpu_pinning() {
}
file_put_contents($filename, $postXML);
}
// Save only - template written, navigate back without log output
if ($save_only) {
echo "<script>done();</script>";
goto END;
}
readfile("$docroot/plugins/dynamix.docker.manager/log.htm");
@flush();
// Run dry
if ($dry_run) {
echo "<h2>XML</h2>";
Expand Down Expand Up @@ -1444,7 +1450,8 @@ function prepareCategory() {
: <span class="inline-block">
<input type="submit" value="<?=$xmlType=='edit' ? "_(Apply)_" : " _(Apply)_ "?>">
<input type="button" value="_(Done)_" onclick="done()">
<?if ($authoringMode):?><button type="submit" name="dryRun" value="true" onclick="$('*[required]').prop('required', null);">_(Save)_</button><?endif;?>
<button type="submit" name="saveOnly" value="true" onclick="$('*[required]').prop('required', null);">_(Save)_</button>
<?if ($authoringMode):?><button type="submit" name="dryRun" value="true" onclick="$('*[required]').prop('required', null);">_(Dry Run)_</button><?endif;?>
</span>

</form>
Expand Down
Loading