update wfpl and templates

[contractor-progress.git] / tasks.php

diff --git a/tasks.php b/tasks.php
index 8418502..ecbf757 100644 (file)
--- a/tasks.php
+++ b/tasks.php
@@ -68,8 +68,6 @@ function tasks_main() {
                }
                tem_show('edit_body');
        }
-
-       tem_show('main_body');
 }
 
 function tasks_display_main() {
@@ -299,7 +297,7 @@ function prioritize_task($id, $change) {
 
 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) {
@@ -411,6 +409,9 @@ function tasks_edit_main() {
        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'])) {
@@ -522,7 +523,7 @@ function tasks_edit_main() {
        } 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');
                }