diff options
| author | Harald Eilertsen <haraldei@anduin.net> | 2021-09-05 16:33:27 +0200 |
|---|---|---|
| committer | Harald Eilertsen <haraldei@anduin.net> | 2021-09-05 16:33:27 +0200 |
| commit | 30c78c1653e0a0e5ec1cf72570561ccdd2eddc26 (patch) | |
| tree | d7fe4525b60681825aefb32322bbb467d091ba7c /includes/admin/views | |
| parent | 36220bf496116c91ed01efbc981dafae55d55915 (diff) | |
| parent | aa688626d52d4e7fd3df16dc620cf96697c3f95a (diff) | |
| download | gigologadmin-30c78c1653e0a0e5ec1cf72570561ccdd2eddc26.tar.gz gigologadmin-30c78c1653e0a0e5ec1cf72570561ccdd2eddc26.tar.bz2 gigologadmin-30c78c1653e0a0e5ec1cf72570561ccdd2eddc26.zip | |
Merge remote-tracking branch 'andrea/andreaschanges' into dev
Diffstat (limited to 'includes/admin/views')
| -rw-r--r-- | includes/admin/views/_concerts_table.php | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/includes/admin/views/_concerts_table.php b/includes/admin/views/_concerts_table.php index d92c729..685ee07 100644 --- a/includes/admin/views/_concerts_table.php +++ b/includes/admin/views/_concerts_table.php @@ -51,6 +51,9 @@ if (!class_exists("GiglogAdmin_ConcertsTable")) $venue = filter_input( INPUT_POST, 'selectvenue', FILTER_SANITIZE_SPECIAL_CHARS ); if ($venue) $filter['venue_id'] = $venue; + if(isset($_POST['ownconcerts']) && $_POST['ownconcerts'] == '1') + $filter['currentuser'] = wp_get_current_user()->user_login; + $concerts = GiglogAdmin_Concert::find_concerts($filter); $lastType = ''; @@ -59,15 +62,15 @@ if (!class_exists("GiglogAdmin_ConcertsTable")) $content .= '<tr class="assignitr">'; if ($lastType != '' && $lastType != $concert->venue()->city()) { - $content .= '<td>' . $concert->venue()->city() . '</td></tr><tr>'; + $content .= '<td>' . $concert->venue()->city() . '</td></tr><tr class="assignitr">'; } if ($lastType == '' ) { - $content .= '<td>' . $concert->venue()->city() . '</td></tr><tr>'; + $content .= '<td>' . $concert->venue()->city() . '</td></tr><tr class="assignitr">'; } // Modify these to match the database structure // $content .= '<td>' . $row->id. '</td>'; - $content .= '<td></td>'; + $content .= '<td></br></br></td>'; $content .= '<td>' . $concert->cname() . '</td>'; $content .= '<td>' . $concert->venue()->name() . '</td>'; $fdate = strtotime($concert->cdate()); @@ -75,12 +78,12 @@ if (!class_exists("GiglogAdmin_ConcertsTable")) //$content .= DATE_FORMAT($fdate,'%d.%b.%Y'); $content .= '<td>' . $newformat . '</td>'; - $content .= '<td>' . $this->mark_new_concert($concert) . '</td>'; + $content .= '<td class="publishstatus">' . $this->mark_new_concert($concert) . '</td>'; - $content .= '<td>' . $this->assign_role_for_user_form('photo1', $concert) . '</td>'; - $content .= '<td>' . $this->assign_role_for_user_form('photo2', $concert) . '</td>'; - $content .= '<td>' . $this->assign_role_for_user_form('rev1', $concert) . '</td>'; - $content .= '<td>' . $this->assign_role_for_user_form('rev2', $concert) . '</td>'; + $content .= '<td class="assigneduser">' . $this->assign_role_for_user_form('photo1', $concert) . '</td>'; + $content .= '<td> class="assigneduser">' . $this->assign_role_for_user_form('photo2', $concert) . '</td>'; + $content .= '<td class="assigneduser">' . $this->assign_role_for_user_form('rev1', $concert) . '</td>'; + $content .= '<td class="assigneduser">' . $this->assign_role_for_user_form('rev2', $concert) . '</td>'; $content .= '<td>' . self::STATUS_LABELS[$concert->status()] . '</td>'; @@ -124,8 +127,8 @@ if (!class_exists("GiglogAdmin_ConcertsTable")) } //option to select own concerts only $select .= '<input class="ownconc" type="checkbox" value="1"'; - if(isset($_POST['my_checkbox'])) $select .=' checked="checked" '; - $select.=' name="my_checkbox">Show own concerts only</input>'; + if(isset($_POST['ownconcerts'])) $select .=' checked="checked" '; + $select.=' name="ownconcerts">Show own concerts only</input>'; $select .= '<input type="submit" value="APPLY"></form>'; @@ -174,7 +177,7 @@ if (!class_exists("GiglogAdmin_ConcertsTable")) $f = '<form class="unassignit" method="POST" action="">' . ' <input type="hidden" name="cid" value="' . $concert->id() . '" />' . ' <input type="hidden" name="pid" value="' . $role . '" />' - . ' <input type="submit" name="unassignitem" value="Your"/>' + . ' <input type="submit" name="unassignitem" value=""/>' . '</form>'; } elseif ( $assigned_user ) { //check if slot is taken by another user |