Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
contractor-progress.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clients are now sorted by name
[contractor-progress.git]
/
tasks.php
diff --git
a/tasks.php
b/tasks.php
index
8418502
..
58737a3
100644
(file)
--- a/
tasks.php
+++ b/
tasks.php
@@
-299,7
+299,7
@@
function prioritize_task($id, $change) {
function tasks_edit_main() {
$state = TASK_DRAFT; # will be overwritten
function tasks_edit_main() {
$state = TASK_DRAFT; # will be overwritten
- $client_id = logged_in(); # fixed shortly if we're contractor
+ $client_id = logged_in(); # fixed shortly if we're contractor, unless it's a new task by the contractor
$edit_id = format_int($_REQUEST['tasks_edit_id']);
unset($_REQUEST['tasks_edit_id']);
if($edit_id) {
$edit_id = format_int($_REQUEST['tasks_edit_id']);
unset($_REQUEST['tasks_edit_id']);
if($edit_id) {
@@
-411,6
+411,9
@@
function tasks_edit_main() {
if(isset($_REQUEST['title'])) {
list($title, $url, $description, $price) = tasks_get_fields();
$queuing = false;
if(isset($_REQUEST['title'])) {
list($title, $url, $description, $price) = tasks_get_fields();
$queuing = false;
+ if(logged_in_as_contractor() && $_REQUEST['client_id']) {
+ $client_id = format_int($_REQUEST['client_id']);
+ }
# FIXME
if(isset($_REQUEST['save_draft'])) {
# FIXME
if(isset($_REQUEST['save_draft'])) {
@@
-522,7
+525,7
@@
function tasks_edit_main() {
} else {
tem_show('new_msg');
if(logged_in_as_contractor()) {
} else {
tem_show('new_msg');
if(logged_in_as_contractor()) {
- pulldown('client_id', db_get_rows('people', 'id,name', 'where id > 1'), PULLDOWN_2D);
+ pulldown('client_id', db_get_rows('people', 'id,name', 'where id > 1 order by name'), PULLDOWN_2D);
tem_set('client_id', format_int($_REQUEST['client_id']));
tem_show('client_row');
}
tem_set('client_id', format_int($_REQUEST['client_id']));
tem_show('client_row');
}