summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-09-01 23:43:48 (GMT)
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-09-01 23:43:48 (GMT)
commitf66659f20d214022ed40faaf9689fdd005b28bf4 (patch)
tree33366ca3b5ea0f5930a7a13444a1f246da17dcef
parent7d5258a69c6c95016bc01b1d35d7cd7f6ea4ba3c (diff)
downloadkolab-wap-f66659f20d214022ed40faaf9689fdd005b28bf4.tar.gz
Resolve #984:
- Fix post add/edit/delete UI update by setting back the watermark after the action has been executed. - List the contents of the directory information tree before considering adding a form for users logged in that can add entries
-rw-r--r--lib/client/kolab_client_task_domain.php7
-rw-r--r--lib/client/kolab_client_task_group.php7
-rw-r--r--lib/client/kolab_client_task_resource.php7
-rw-r--r--lib/client/kolab_client_task_role.php6
-rw-r--r--lib/client/kolab_client_task_user.php7
-rw-r--r--lib/kolab_client_task.php1
-rw-r--r--public_html/js/kolab_admin.js14
7 files changed, 29 insertions, 20 deletions
diff --git a/lib/client/kolab_client_task_domain.php b/lib/client/kolab_client_task_domain.php
index 60d84ef..14c5034 100644
--- a/lib/client/kolab_client_task_domain.php
+++ b/lib/client/kolab_client_task_domain.php
@@ -38,15 +38,13 @@ class kolab_client_task_domain extends kolab_client_task
$this->output->set_object('content', 'domain', true);
$this->output->set_object('task_navigation', $this->menu());
+ $this->action_list();
+
// display form to add domain if logged-in user has right to do so
$caps = $this->get_capability('actions');
if($caps['domain.add']['type'] == 'w') {
$this->action_add();
- } else {
- $this->watermark('taskcontent');
}
-
- $this->action_list();
}
/**
@@ -173,6 +171,7 @@ class kolab_client_task_domain extends kolab_client_task
$this->output->set_env('list_page', $page);
$this->output->set_env('list_count', $count);
+ $this->watermark('taskcontent');
$this->output->set_object('domainlist', $table);
}
diff --git a/lib/client/kolab_client_task_group.php b/lib/client/kolab_client_task_group.php
index b31ac86..ef7b76c 100644
--- a/lib/client/kolab_client_task_group.php
+++ b/lib/client/kolab_client_task_group.php
@@ -38,15 +38,13 @@ class kolab_client_task_group extends kolab_client_task
$this->output->set_object('content', 'group', true);
$this->output->set_object('task_navigation', $this->menu());
+ $this->action_list();
+
// display form to add group if logged-in user has right to do so
$caps = $this->get_capability('actions');
if($caps['group.add']['type'] == 'w') {
$this->action_add();
- } else {
- $this->watermark('taskcontent');
}
-
- $this->action_list();
}
/**
@@ -165,6 +163,7 @@ class kolab_client_task_group extends kolab_client_task
$this->output->set_env('list_page', $page);
$this->output->set_env('list_count', $count);
+ $this->watermark('taskcontent');
$this->output->set_object('grouplist', $table);
}
diff --git a/lib/client/kolab_client_task_resource.php b/lib/client/kolab_client_task_resource.php
index 42d6554..1535fe8 100644
--- a/lib/client/kolab_client_task_resource.php
+++ b/lib/client/kolab_client_task_resource.php
@@ -38,15 +38,13 @@ class kolab_client_task_resource extends kolab_client_task
$this->output->set_object('content', 'resource', true);
$this->output->set_object('task_navigation', $this->menu());
+ $this->action_list();
+
// display form to add resource if logged-in user has right to do so
$caps = $this->get_capability('actions');
if($caps['resource.add']['type'] == 'w') {
$this->action_add();
- } else {
- $this->watermark('taskcontent');
}
-
- $this->action_list();
}
/**
@@ -167,6 +165,7 @@ class kolab_client_task_resource extends kolab_client_task
$this->output->set_env('list_page', $page);
$this->output->set_env('list_count', $count);
+ $this->watermark('taskcontent');
$this->output->set_object('resourcelist', $table);
}
diff --git a/lib/client/kolab_client_task_role.php b/lib/client/kolab_client_task_role.php
index eadaa59..c13b845 100644
--- a/lib/client/kolab_client_task_role.php
+++ b/lib/client/kolab_client_task_role.php
@@ -38,15 +38,14 @@ class kolab_client_task_role extends kolab_client_task
$this->output->set_object('content', 'role', true);
$this->output->set_object('task_navigation', $this->menu());
+ $this->action_list();
+
// display form to add role if logged-in user has right to do so
$caps = $this->get_capability('actions');
if($caps['role.add']['type'] == 'w') {
$this->action_add();
- } else {
- $this->watermark('taskcontent');
}
- $this->action_list();
}
/**
@@ -165,6 +164,7 @@ class kolab_client_task_role extends kolab_client_task
$this->output->set_env('list_page', $page);
$this->output->set_env('list_count', $count);
+ $this->watermark('taskcontent');
$this->output->set_object('rolelist', $table);
}
diff --git a/lib/client/kolab_client_task_user.php b/lib/client/kolab_client_task_user.php
index 5a198e0..8102e8c 100644
--- a/lib/client/kolab_client_task_user.php
+++ b/lib/client/kolab_client_task_user.php
@@ -38,15 +38,13 @@ class kolab_client_task_user extends kolab_client_task
$this->output->set_object('content', 'user', true);
$this->output->set_object('task_navigation', $this->menu());
+ $this->action_list();
+
// display form to add user if logged-in user has right to do so
$caps = $this->get_capability('actions');
if($caps['user.add']['type'] == 'w') {
$this->action_add();
- } else {
- $this->watermark('taskcontent');
}
-
- $this->action_list();
}
/**
@@ -165,6 +163,7 @@ class kolab_client_task_user extends kolab_client_task
$this->output->set_env('list_page', $page);
$this->output->set_env('list_count', $count);
+ $this->watermark('taskcontent');
$this->output->set_object('userlist', $table);
}
diff --git a/lib/kolab_client_task.php b/lib/kolab_client_task.php
index ba799e3..250332a 100644
--- a/lib/kolab_client_task.php
+++ b/lib/kolab_client_task.php
@@ -48,7 +48,6 @@ class kolab_client_task
protected static $translation = array();
-
/**
* Class constructor.
*/
diff --git a/public_html/js/kolab_admin.js b/public_html/js/kolab_admin.js
index bb6ddc3..be08f8a 100644
--- a/public_html/js/kolab_admin.js
+++ b/public_html/js/kolab_admin.js
@@ -1089,6 +1089,7 @@ function kolab_admin()
this.display_message('domain.add.success');
this.command('domain.list', {page: this.env.list_page});
+ this.set_watermark('taskcontent');
};
this.domain_edit_response = function(response)
@@ -1098,6 +1099,7 @@ function kolab_admin()
this.display_message('domain.edit.success');
this.command('domain.list', {page: this.env.list_page});
+ this.set_watermark('taskcontent');
};
this.user_info = function(id)
@@ -1135,6 +1137,7 @@ function kolab_admin()
this.display_message('user.delete.success');
this.command('user.list', {page: page});
+ this.set_watermark('taskcontent');
};
this.user_save = function(reload, section)
@@ -1174,6 +1177,7 @@ function kolab_admin()
this.display_message('user.add.success');
this.command('user.list', {page: this.env.list_page});
+ this.set_watermark('taskcontent');
};
this.user_edit_response = function(response)
@@ -1183,6 +1187,7 @@ function kolab_admin()
this.display_message('user.edit.success');
this.command('user.list', {page: this.env.list_page});
+ this.set_watermark('taskcontent');
};
this.group_info = function(id)
@@ -1220,6 +1225,7 @@ function kolab_admin()
this.display_message('group.delete.success');
this.command('group.list', {page: page});
+ this.set_watermark('taskcontent');
};
this.group_save = function(reload, section)
@@ -1251,6 +1257,7 @@ function kolab_admin()
this.display_message('group.add.success');
this.command('group.list', {page: this.env.list_page});
+ this.set_watermark('taskcontent');
};
this.group_edit_response = function(response)
@@ -1260,6 +1267,7 @@ function kolab_admin()
this.display_message('group.edit.success');
this.command('group.list', {page: this.env.list_page});
+ this.set_watermark('taskcontent');
};
this.resource_info = function(id)
@@ -1297,6 +1305,7 @@ function kolab_admin()
this.display_message('resource.delete.success');
this.command('resource.list', {page: page});
+ this.set_watermark('taskcontent');
};
this.resource_save = function(reload, section)
@@ -1328,6 +1337,7 @@ function kolab_admin()
this.display_message('resource.add.success');
this.command('resource.list', {page: this.env.list_page});
+ this.set_watermark('taskcontent');
};
this.resource_edit_response = function(response)
@@ -1337,6 +1347,7 @@ function kolab_admin()
this.display_message('resource.edit.success');
this.command('resource.list', {page: this.env.list_page});
+ this.set_watermark('taskcontent');
};
this.role_info = function(id)
@@ -1374,6 +1385,7 @@ function kolab_admin()
this.display_message('role.delete.success');
this.command('role.list', {page: page});
+ this.set_watermark('taskcontent');
};
this.role_save = function(reload, section)
@@ -1405,6 +1417,7 @@ function kolab_admin()
this.display_message('role.add.success');
this.command('role.list', {page: this.env.list_page});
+ this.set_watermark('taskcontent');
};
this.role_edit_response = function(response)
@@ -1414,6 +1427,7 @@ function kolab_admin()
this.display_message('role.edit.success');
this.command('role.list', {page: this.env.list_page});
+ this.set_watermark('taskcontent');
};
this.generate_password = function(fieldname)