summaryrefslogtreecommitdiffstats
path: root/includes/admin/views
diff options
context:
space:
mode:
authorHarald Eilertsen <haraldei@anduin.net>2021-04-15 21:29:26 +0200
committerHarald Eilertsen <haraldei@anduin.net>2021-04-15 21:29:26 +0200
commite59f12fd21af5489b8889aa4c3ab5a90a9b317a9 (patch)
tree160214bb992a2b5287996606f6a7daba681527f0 /includes/admin/views
parentf8f01743b8b5256dda9e199f5d8e77ddb9eea278 (diff)
parent02caa8be1541d11a65dc00cdea08d1b0bc932ba5 (diff)
downloadgigologadmin-e59f12fd21af5489b8889aa4c3ab5a90a9b317a9.tar.gz
gigologadmin-e59f12fd21af5489b8889aa4c3ab5a90a9b317a9.tar.bz2
gigologadmin-e59f12fd21af5489b8889aa4c3ab5a90a9b317a9.zip
Merge remote-tracking branch 'andrea/andreaschanges' into dev
Diffstat (limited to 'includes/admin/views')
-rw-r--r--includes/admin/views/giglog_admin_page.php39
-rw-r--r--includes/admin/views/giglog_import_gigs.php4
2 files changed, 32 insertions, 11 deletions
diff --git a/includes/admin/views/giglog_admin_page.php b/includes/admin/views/giglog_admin_page.php
index b59ade3..b6fe098 100644
--- a/includes/admin/views/giglog_admin_page.php
+++ b/includes/admin/views/giglog_admin_page.php
@@ -62,12 +62,13 @@ if ( !class_exists( 'GiglogAdmin_AdminPage' ) ) {
return($select);
}
- static function get_countries()
+ static function get_countries($incountry)
{
$select = '<select name="selectcountry">';
$select .= '<option value="">Please Select..</option>';
foreach ( GiglogAdmin_Band::all_countries() AS $country ) {
- $select .= '<option value="' . $country->id. '">'. $country->cname;
+ if($incountry==$country ->id) $select .= '<option value="' . $country -> id. '" selected="selected">'.$country->cname;
+ else $select .= '<option value="' . $country->id. '">'. $country->cname;
$select .='</option>';
}
$select .= '</select>';
@@ -152,10 +153,18 @@ if ( !class_exists( 'GiglogAdmin_AdminPage' ) ) {
$content.='</form>';
$content.='<form method="POST" action="" class="bandedit" ><br>'
- .'<label for="bandname">Band Name:</label><input type="text" id="bandname" name="bandname"><br>'
- .'<label for="eventurl">Band Country:</label>'.GiglogAdmin_AdminPage::get_countries().'<br>'
- .'<p><input type="submit" name="newband" value="Create New Band"></p>'
- .'</form>';
+ .'<input type="hidden" name="bid" value="' .$c->band(). '" />'
+ .'<label for="bandname">Band Name:</label><input type="text" id="bandname" name="bandname" value="'.GiglogAdmin_Band::get_band($c->band())[0].'"><br>'
+ .'<label for="eventurl">Band Country:</label>'.GiglogAdmin_AdminPage::get_countries(GiglogAdmin_Band::get_band($c->band())[1]).'<br>';
+
+ if ($editing) {
+ $content.='<p><input type="submit" name="editband" value="Edit Band"></p>';
+ }
+ else {
+ $content.='<p><input type="submit" name="newband" value="Create New Band"></p>';
+ }
+
+ $content.='</form>';
$content.='<form method="POST" action="" class="bandedit" ><br>'
.'<label for="bandname">Venue Name:</label><input type="text" id="venuename" name="venuename"><br>'
@@ -336,8 +345,9 @@ if ( !class_exists( 'GiglogAdmin_AdminPage' ) ) {
echo '<script language="javascript">alert("You are missing a value, concert was not created"); </script>';
else
{
- GiglogAdmin_Concert::find_or_create($_POST['selectband'], $_POST['selectvenueadmin'], $_POST['cdate'], $_POST['ticket'], $_POST['eventurl']);
- echo '<script language="javascript">alert("Yey, concert created"); </script>';
+ $ret = GiglogAdmin_Concert::create($_POST['selectband'], $_POST['selectvenueadmin'], $_POST['cdate'], $_POST['ticket'], $_POST['eventurl']);
+ if ($ret!='dup') echo '<script language="javascript">alert("Yey, concert created"); </script>';
+ else echo '<script language="javascript">alert("Nay, concert was duplicated"); </script>';
}
}
if(isset($_POST['editconcert']))
@@ -346,7 +356,7 @@ if ( !class_exists( 'GiglogAdmin_AdminPage' ) ) {
echo '<script language="javascript">alert("You are missing a value, concert was not updated"); </script>';
else
{
- GiglogAdmin_Concert::updatec($_POST['pid'],$_POST['selectband'], $_POST['selectvenueadmin'], $_POST['cdate'], $_POST['ticket'], $_POST['eventurl']);
+ GiglogAdmin_Concert::update_concert($_POST['pid'],$_POST['selectband'], $_POST['selectvenueadmin'], $_POST['cdate'], $_POST['ticket'], $_POST['eventurl']);
echo '<script language="javascript">alert("Yey, concert updated"); </script>';
}
}
@@ -362,6 +372,17 @@ if ( !class_exists( 'GiglogAdmin_AdminPage' ) ) {
}
}
+ if(isset($_POST['editband']))
+ {
+ IF (empty($_POST['bandname'])) //country is not checked as it is set to Norway by default
+ echo '<script language="javascript">alert("You are missing band name, band was not edited"); </script>';
+ else
+ {
+ GiglogAdmin_Band::update_band($_POST['bid'],$_POST['bandname'],$_POST['selectcountry']);
+ echo '<script language="javascript">alert("Yey, band updated"); </script>';
+ }
+ }
+
if(isset($_POST['newvenue']))
{
IF (empty($_POST['venuename']) || empty($_POST['venuecity']))
diff --git a/includes/admin/views/giglog_import_gigs.php b/includes/admin/views/giglog_import_gigs.php
index c2dfd2a..ca1c7b8 100644
--- a/includes/admin/views/giglog_import_gigs.php
+++ b/includes/admin/views/giglog_import_gigs.php
@@ -69,7 +69,7 @@ if ( !class_exists( 'GiglogAdmin_ImportGigsPage' ) ) {
//first item in the row should be band $resultArray[0]; second should be venue $resultArray[1]; third should be concert date $resultArray[2];
//fourth item is ticketlink $resultArray[3]; fifth item is eventlink $resultArray[4];
- $newconcert[0] = GiglogAdmin_Band::find_or_create($band,'NO');
+ $newconcert[0] = GiglogAdmin_Band::create($band,'');
if (is_numeric($venue))
$newconcert[1] = $venue;
@@ -80,7 +80,7 @@ if ( !class_exists( 'GiglogAdmin_ImportGigsPage' ) ) {
//not sure how to check dates, hopefully manual verification of files will take care of it
- GiglogAdmin_Concert::find_or_create(
+ GiglogAdmin_Concert::create(
$newconcert[0],
$newconcert[1],
$condate,