lib/client

[Aleksander Machniak]

 lib/client/kolab_client_task_domain.php   |    5 ++++-
 lib/client/kolab_client_task_group.php    |    5 ++++-
 lib/client/kolab_client_task_resource.php |    5 ++++-
 lib/client/kolab_client_task_role.php     |    5 ++++-
 lib/client/kolab_client_task_settings.php |    5 ++++-
 lib/client/kolab_client_task_user.php     |    5 ++++-
 6 files changed, 24 insertions(+), 6 deletions(-)

New commits:
commit a1cfea9787b8ebf7d1a756aa7a5740d2527e2d22
Author: Aleksander Machniak <alec at alec.pl>
Date:   Thu Sep 27 10:12:17 2012 +0200

    Fix so object creation form is displayed by default on default task action

diff --git a/lib/client/kolab_client_task_domain.php b/lib/client/kolab_client_task_domain.php
index 3a9f6a9..8a538fc 100644
--- a/lib/client/kolab_client_task_domain.php
+++ b/lib/client/kolab_client_task_domain.php
@@ -170,7 +170,10 @@ class kolab_client_task_domain extends kolab_client_task
             'foot'  => $foot,
         ));
 
-        $this->output->command('set_watermark', 'taskcontent');
+        if ($this->action == 'list') {
+            $this->output->command('set_watermark', 'taskcontent');
+        }
+
         $this->output->set_env('search_request', $search_request ? base64_encode(serialize($search_request)) : null);
         $this->output->set_env('list_page', $page);
         $this->output->set_env('list_count', $count);
diff --git a/lib/client/kolab_client_task_group.php b/lib/client/kolab_client_task_group.php
index fada00c..eb5e6b7 100644
--- a/lib/client/kolab_client_task_group.php
+++ b/lib/client/kolab_client_task_group.php
@@ -162,7 +162,10 @@ class kolab_client_task_group extends kolab_client_task
             'foot'  => $foot,
         ));
 
-        $this->output->command('set_watermark', 'taskcontent');
+        if ($this->action == 'list') {
+            $this->output->command('set_watermark', 'taskcontent');
+        }
+
         $this->output->set_env('search_request', $search_request ? base64_encode(serialize($search_request)) : null);
         $this->output->set_env('list_page', $page);
         $this->output->set_env('list_count', $count);
diff --git a/lib/client/kolab_client_task_resource.php b/lib/client/kolab_client_task_resource.php
index 8dde136..f0ce4b0 100644
--- a/lib/client/kolab_client_task_resource.php
+++ b/lib/client/kolab_client_task_resource.php
@@ -164,7 +164,10 @@ class kolab_client_task_resource extends kolab_client_task
             'foot'  => $foot,
         ));
 
-        $this->output->command('set_watermark', 'taskcontent');
+        if ($this->action == 'list') {
+            $this->output->command('set_watermark', 'taskcontent');
+        }
+
         $this->output->set_env('search_request', $search_request ? base64_encode(serialize($search_request)) : null);
         $this->output->set_env('list_page', $page);
         $this->output->set_env('list_count', $count);
diff --git a/lib/client/kolab_client_task_role.php b/lib/client/kolab_client_task_role.php
index 4640716..beac689 100644
--- a/lib/client/kolab_client_task_role.php
+++ b/lib/client/kolab_client_task_role.php
@@ -162,7 +162,10 @@ class kolab_client_task_role extends kolab_client_task
             'foot'  => $foot,
         ));
 
-        $this->output->command('set_watermark', 'taskcontent');
+        if ($this->action == 'list') {
+            $this->output->command('set_watermark', 'taskcontent');
+        }
+
         $this->output->set_env('search_request', $search_request ? base64_encode(serialize($search_request)) : null);
         $this->output->set_env('list_page', $page);
         $this->output->set_env('list_count', $count);
diff --git a/lib/client/kolab_client_task_settings.php b/lib/client/kolab_client_task_settings.php
index 061c65f..09d7697 100644
--- a/lib/client/kolab_client_task_settings.php
+++ b/lib/client/kolab_client_task_settings.php
@@ -290,7 +290,10 @@ class kolab_client_task_settings extends kolab_client_task
             'foot'  => $foot,
         ));
 
-        $this->output->command('set_watermark', 'taskcontent');
+        if ($this->action == 'type_list') {
+            $this->output->command('set_watermark', 'taskcontent');
+        }
+
         $this->output->set_env('search_request', $search_request ? base64_encode(serialize($search_request)) : null);
         $this->output->set_env('list_page', $page);
         $this->output->set_env('list_count', $count);
diff --git a/lib/client/kolab_client_task_user.php b/lib/client/kolab_client_task_user.php
index 859f29a..cf4d9b9 100644
--- a/lib/client/kolab_client_task_user.php
+++ b/lib/client/kolab_client_task_user.php
@@ -162,7 +162,10 @@ class kolab_client_task_user extends kolab_client_task
             'foot'  => $foot,
         ));
 
-        $this->output->command('set_watermark', 'taskcontent');
+        if ($this->action == 'list') {
+            $this->output->command('set_watermark', 'taskcontent');
+        }
+
         $this->output->set_env('search_request', $search_request ? base64_encode(serialize($search_request)) : null);
         $this->output->set_env('list_page', $page);
         $this->output->set_env('list_count', $count);