Use same fields for add and edit wish
This commit is contained in:
parent
1fde8a81be
commit
6c47875d78
13 changed files with 111 additions and 108 deletions
|
@ -56,21 +56,25 @@ switch ($_SERVER['REQUEST_METHOD']) {
|
||||||
|
|
||||||
$wishlist_id = $_POST['wishlist_id'];
|
$wishlist_id = $_POST['wishlist_id'];
|
||||||
$wish_title = trim($_POST['wish_title']);
|
$wish_title = trim($_POST['wish_title']);
|
||||||
$wish_description = $_POST['wish_description'] ?: '';
|
$wish_description = trim($_POST['wish_description']);
|
||||||
$wish_url = trim($_POST['wish_url']);
|
$wish_url = trim($_POST['wish_url']);
|
||||||
|
$wish_priority = isset($_POST['wish_priority']) && $_POST['wish_priority'] ? $_POST['wish_priority'] : 'NULL';
|
||||||
|
|
||||||
$database->query('INSERT INTO `wishes`
|
$database
|
||||||
(
|
->query('INSERT INTO `wishes`
|
||||||
`wishlist`,
|
(
|
||||||
`title`,
|
`wishlist`,
|
||||||
`description`,
|
`title`,
|
||||||
`url`
|
`description`,
|
||||||
) VALUES ('
|
`url`,
|
||||||
. $wishlist_id . ',
|
`priority`
|
||||||
"' . $wish_title . '",
|
) VALUES (
|
||||||
"' . $wish_description . '",
|
' . $wishlist_id . ',
|
||||||
"' . $wish_url . '"
|
"' . $wish_title . '",
|
||||||
)
|
"' . $wish_description . '",
|
||||||
|
"' . $wish_url . '",
|
||||||
|
' . $wish_priority . '
|
||||||
|
)
|
||||||
;');
|
;');
|
||||||
|
|
||||||
$response['data'] = array(
|
$response['data'] = array(
|
||||||
|
|
8
src/assets/js/parts/wish-priority.js
Normal file
8
src/assets/js/parts/wish-priority.js
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
$(function () {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Priority
|
||||||
|
*/
|
||||||
|
$('.dropdown.priority').dropdown();
|
||||||
|
|
||||||
|
});
|
|
@ -144,9 +144,4 @@ $(function () {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
|
||||||
* Priority
|
|
||||||
*/
|
|
||||||
$('.dropdown.priority').dropdown();
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -55,8 +55,6 @@ $(function () {
|
||||||
/** Update URL */
|
/** Update URL */
|
||||||
urlParams.set('id', wishlistValue);
|
urlParams.set('id', wishlistValue);
|
||||||
|
|
||||||
console.log(wishlistValue);
|
|
||||||
|
|
||||||
fetch('/src/api/url.php?url=' + window.btoa(urlParams.toString()), {
|
fetch('/src/api/url.php?url=' + window.btoa(urlParams.toString()), {
|
||||||
method: 'GET'
|
method: 'GET'
|
||||||
})
|
})
|
||||||
|
@ -368,8 +366,8 @@ $(function () {
|
||||||
modalWishlistWishAdd.find('[name="wishlist_id"]').val($('.ui.dropdown.wishlists').dropdown('get value'));
|
modalWishlistWishAdd.find('[name="wishlist_id"]').val($('.ui.dropdown.wishlists').dropdown('get value'));
|
||||||
modalWishlistWishAdd
|
modalWishlistWishAdd
|
||||||
.modal({
|
.modal({
|
||||||
autoShow : true,
|
autoShow : true,
|
||||||
onApprove: function (buttonAdd) {
|
onApprove : function (buttonAdd) {
|
||||||
buttonAdd.addClass('loading');
|
buttonAdd.addClass('loading');
|
||||||
|
|
||||||
var form = $('.form.wishlist-wish-add');
|
var form = $('.form.wishlist-wish-add');
|
||||||
|
|
|
@ -31,7 +31,7 @@ switch ($step) {
|
||||||
<p><?= __('Welcome to the wishthis installer.') ?></p>
|
<p><?= __('Welcome to the wishthis installer.') ?></p>
|
||||||
<p><?= __('wishthis needs a database to function properly. Please enter your credentials.') ?></p>
|
<p><?= __('wishthis needs a database to function properly. Please enter your credentials.') ?></p>
|
||||||
|
|
||||||
<form class="ui form" action="/?page=install" method="post">
|
<form class="ui form" action="/?page=install" method="POST">
|
||||||
<input type="hidden" name="install" value="true" />
|
<input type="hidden" name="install" value="true" />
|
||||||
<input type="hidden" name="step" value="<?= $step + 1; ?>" />
|
<input type="hidden" name="step" value="<?= $step + 1; ?>" />
|
||||||
|
|
||||||
|
@ -101,7 +101,7 @@ switch ($step) {
|
||||||
<h2 class="ui header"><?= sprintf(__('Step %d'), $step) ?></h2>
|
<h2 class="ui header"><?= sprintf(__('Step %d'), $step) ?></h2>
|
||||||
<p><?= __('Click continue to test the database connection.') ?></p>
|
<p><?= __('Click continue to test the database connection.') ?></p>
|
||||||
|
|
||||||
<form class="ui form" action="?page=install" method="post">
|
<form class="ui form" action="?page=install" method="POST">
|
||||||
<input type="hidden" name="install" value="true" />
|
<input type="hidden" name="install" value="true" />
|
||||||
<input type="hidden" name="step" value="<?= $step + 1; ?>" />
|
<input type="hidden" name="step" value="<?= $step + 1; ?>" />
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@ $page->navigation();
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<div class="ui segment">
|
<div class="ui segment">
|
||||||
<form class="ui form" method="post">
|
<form class="ui form" method="POST">
|
||||||
<div class="field">
|
<div class="field">
|
||||||
<label><?= __('Email') ?></label>
|
<label><?= __('Email') ?></label>
|
||||||
<input type="email" name="email" placeholder="john.doe@domain.tld" />
|
<input type="email" name="email" placeholder="john.doe@domain.tld" />
|
||||||
|
|
|
@ -105,7 +105,7 @@ $page->navigation();
|
||||||
<div class="column">
|
<div class="column">
|
||||||
<h2 class="ui header"><?= __('Credentials') ?></h2>
|
<h2 class="ui header"><?= __('Credentials') ?></h2>
|
||||||
|
|
||||||
<form class="ui form login" method="post">
|
<form class="ui form login" method="POST">
|
||||||
<div class="field">
|
<div class="field">
|
||||||
<label><?= __('Email') ?></label>
|
<label><?= __('Email') ?></label>
|
||||||
|
|
||||||
|
@ -147,7 +147,7 @@ $page->navigation();
|
||||||
|
|
||||||
<?php if ($options->getOption('mjml_api_key') && $options->getOption('mjml_api_secret')) { ?>
|
<?php if ($options->getOption('mjml_api_key') && $options->getOption('mjml_api_secret')) { ?>
|
||||||
<p>
|
<p>
|
||||||
<form class="ui form reset" method="post">
|
<form class="ui form reset" method="POST">
|
||||||
<div class="field">
|
<div class="field">
|
||||||
<div class="ui action input">
|
<div class="ui action input">
|
||||||
<div class="ui left icon action input">
|
<div class="ui left icon action input">
|
||||||
|
|
71
src/pages/parts/wish-add.php
Normal file
71
src/pages/parts/wish-add.php
Normal file
|
@ -0,0 +1,71 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Jay Trees <github.jay@grandel.anonaddy.me>
|
||||||
|
*/
|
||||||
|
|
||||||
|
use wishthis\Wish;
|
||||||
|
|
||||||
|
$scriptPart = '/src/assets/js/parts/wish-priority.js';
|
||||||
|
?>
|
||||||
|
<script defer src="<?= $scriptPart ?>?m=<?= filemtime(ROOT . $scriptPart) ?>"></script>
|
||||||
|
|
||||||
|
<div class="stackable row">
|
||||||
|
<div class="column">
|
||||||
|
|
||||||
|
<div class="field">
|
||||||
|
<label><?= __('Title') ?></label>
|
||||||
|
|
||||||
|
<div class="ui input">
|
||||||
|
<input type="text"
|
||||||
|
name="wish_title"
|
||||||
|
placeholder="<?= $wish->title ?? '' ?>"
|
||||||
|
value="<?= $wish->title ?? '' ?>"
|
||||||
|
maxlength="128"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="field">
|
||||||
|
<label><?= __('Description') ?></label>
|
||||||
|
|
||||||
|
<textarea name="wish_description"
|
||||||
|
placeholder="<?= $wish->description ?? '' ?>"
|
||||||
|
><?= $wish->description ?? '' ?></textarea>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="column">
|
||||||
|
|
||||||
|
<div class="field">
|
||||||
|
<label><?= __('URL') ?></label>
|
||||||
|
|
||||||
|
<input type="url"
|
||||||
|
name="wish_url"
|
||||||
|
placeholder="<?= $wish->url ?? '' ?>"
|
||||||
|
value="<?= $wish->url ?? '' ?>"
|
||||||
|
maxlength="255"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="field">
|
||||||
|
<label><?= __('Priority') ?></label>
|
||||||
|
|
||||||
|
<select class="ui selection clearable dropdown priority"
|
||||||
|
name="wish_priority"
|
||||||
|
>
|
||||||
|
<option value=""><?= __('Select priority') ?></option>
|
||||||
|
|
||||||
|
<?php foreach (Wish::$priorities as $priority => $item) { ?>
|
||||||
|
<?php if (isset($wish->priority) && $wish->priority === $priority) { ?>
|
||||||
|
<option value="<?= $priority ?>" selected><?= $item['name'] ?></option>
|
||||||
|
<?php } else { ?>
|
||||||
|
<option value="<?= $priority ?>"><?= $item['name'] ?></option>
|
||||||
|
<?php } ?>
|
||||||
|
<?php } ?>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
|
@ -8,7 +8,7 @@ use wishthis\Wish;
|
||||||
|
|
||||||
$scriptPart = '/src/assets/js/parts/wishlist-filter.js';
|
$scriptPart = '/src/assets/js/parts/wishlist-filter.js';
|
||||||
?>
|
?>
|
||||||
<script defer src="/src/assets/js/parts/wishlist-filter.js?m=<?= filemtime(ROOT . $scriptPart) ?>"></script>
|
<script defer src="<?= $scriptPart ?>?m=<?= filemtime(ROOT . $scriptPart) ?>"></script>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<div class="ui stackable grid">
|
<div class="ui stackable grid">
|
||||||
|
|
|
@ -164,7 +164,7 @@ $page->navigation();
|
||||||
<?= $page->messages() ?>
|
<?= $page->messages() ?>
|
||||||
|
|
||||||
<div class="ui segment">
|
<div class="ui segment">
|
||||||
<form class="ui form" method="post">
|
<form class="ui form" method="POST">
|
||||||
<div class="ui divided relaxed stackable two column grid">
|
<div class="ui divided relaxed stackable two column grid">
|
||||||
|
|
||||||
<div class=" row">
|
<div class=" row">
|
||||||
|
|
|
@ -67,7 +67,7 @@ $page->navigation();
|
||||||
<h2 class="ui header"><?= __('Database migration') ?></h2>
|
<h2 class="ui header"><?= __('Database migration') ?></h2>
|
||||||
<p><?= __('Thank you for updating wishthis! To complete this update, some changes are required to the database structure.') ?></p>
|
<p><?= __('Thank you for updating wishthis! To complete this update, some changes are required to the database structure.') ?></p>
|
||||||
|
|
||||||
<form class="ui form" method="post">
|
<form class="ui form" method="POST">
|
||||||
<button class="ui orange button"
|
<button class="ui orange button"
|
||||||
type="submit"
|
type="submit"
|
||||||
title="<?= sprintf(__('Migrate to %s'), 'v' . VERSION) ?>"
|
title="<?= sprintf(__('Migrate to %s'), 'v' . VERSION) ?>"
|
||||||
|
|
|
@ -106,66 +106,7 @@ $referer = '/?page=wishlists&id=' . $wish->wishlist;
|
||||||
<input type="hidden" name="wish_image" value="<?= $wish->image ?>" />
|
<input type="hidden" name="wish_image" value="<?= $wish->image ?>" />
|
||||||
|
|
||||||
<div class="ui two column grid">
|
<div class="ui two column grid">
|
||||||
|
<?php include 'parts/wish-add.php' ?>
|
||||||
<div class="stackable row">
|
|
||||||
<div class="column">
|
|
||||||
|
|
||||||
<div class="field">
|
|
||||||
<label><?= __('Title') ?></label>
|
|
||||||
|
|
||||||
<div class="ui input">
|
|
||||||
<input type="text"
|
|
||||||
name="wish_title"
|
|
||||||
placeholder="<?= $wish->title ?>"
|
|
||||||
value="<?= $wish->title ?>"
|
|
||||||
maxlength="128"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="field">
|
|
||||||
<label><?= __('Description') ?></label>
|
|
||||||
|
|
||||||
<textarea name="wish_description"
|
|
||||||
placeholder="<?= $wish->description ?>"
|
|
||||||
><?= $wish->description ?></textarea>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="column">
|
|
||||||
|
|
||||||
<div class="field">
|
|
||||||
<label><?= __('URL') ?></label>
|
|
||||||
|
|
||||||
<input type="url"
|
|
||||||
name="wish_url"
|
|
||||||
placeholder="<?= $wish->url ?>"
|
|
||||||
value="<?= $wish->url ?>"
|
|
||||||
maxlength="255"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="field">
|
|
||||||
<label><?= __('Priority') ?></label>
|
|
||||||
|
|
||||||
<select class="ui selection clearable dropdown priority"
|
|
||||||
name="wish_priority"
|
|
||||||
>
|
|
||||||
<option value=""><?= __('Select priority') ?></option>
|
|
||||||
|
|
||||||
<?php foreach (Wish::$priorities as $priority => $item) { ?>
|
|
||||||
<?php if ($wish->priority === $priority) { ?>
|
|
||||||
<option value="<?= $priority ?>" selected><?= $item['name'] ?></option>
|
|
||||||
<?php } else { ?>
|
|
||||||
<option value="<?= $priority ?>"><?= $item['name'] ?></option>
|
|
||||||
<?php } ?>
|
|
||||||
<?php } ?>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="stackable row">
|
<div class="stackable row">
|
||||||
<div class="sixteen wide column">
|
<div class="sixteen wide column">
|
||||||
|
|
|
@ -175,25 +175,11 @@ $page->navigation();
|
||||||
<div class="description">
|
<div class="description">
|
||||||
<p><?= __('Fill out any or all of the below fields to add your new wish.') ?></p>
|
<p><?= __('Fill out any or all of the below fields to add your new wish.') ?></p>
|
||||||
|
|
||||||
<form class="ui form wishlist-wish-add" method="post">
|
<form class="ui form wishlist-wish-add" method="POST">
|
||||||
<input type="hidden" name="wishlist_id" />
|
<input type="hidden" name="wishlist_id" value="<?= $_GET['id'] ?>" />
|
||||||
|
|
||||||
<div class="field">
|
<div class="ui two column grid">
|
||||||
<label><?= __('Title') ?></label>
|
<?php include 'parts/wish-add.php' ?>
|
||||||
<input type="text" name="wish_title" maxlength="128" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="field">
|
|
||||||
<label><?= __('Description') ?></label>
|
|
||||||
<textarea name="wish_description"></textarea>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="field">
|
|
||||||
<label><?= __('URL') ?></label>
|
|
||||||
|
|
||||||
<div class="ui input url">
|
|
||||||
<input type="url" name="wish_url" maxlength="255" />
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue