phpide-d10

[timetracker.git] / mobile / user_add.php

diff --git a/mobile/user_add.php b/mobile/user_add.php
index 3ffaa01a3d3573cd78d849990391805a1667ca83..ed017de8a7d8e3f9a6fba33fb436722f52f474df 100644 (file)
--- a/mobile/user_add.php
+++ b/mobile/user_add.php
@@ -125,7 +125,7 @@ class RateCellRenderer extends DefaultCellRenderer {
 // Create projects table.
 $table = new Table('projects');
 $table->setIAScript('setDefaultRate');
 // Create projects table.
 $table = new Table('projects');
 $table->setIAScript('setDefaultRate');

-$table->setTableOptions(array('width'=>'100%','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
+$table->setTableOptions(array('width'=>'250','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));

 $table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
 $table->setData($projects);
 $table->setKeyField('id');
 $table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
 $table->setData($projects);
 $table->setKeyField('id');


@@ -148,7 +148,8 @@ if ($request->isPost()) {
   }
   if (!ttValidEmail($cl_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
   if (!ttValidFloat($cl_rate, true)) $err->add($i18n->get('error.field'), $i18n->get('form.users.default_rate'));
   }
   if (!ttValidEmail($cl_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
   if (!ttValidFloat($cl_rate, true)) $err->add($i18n->get('error.field'), $i18n->get('form.users.default_rate'));

-  if (!ttValidFloat($cl_quota_percent, true)) $err->add($i18n->get('error.field'), $i18n->get('form.quota.quota'));
+  if (!ttValidFloat($cl_quota_percent, true)) $err->add($i18n->get('error.field'), $i18n->get('label.quota'));
+  if (!ttUserHelper::canAdd()) $err->add($i18n->get('error.user_count'));

 
   if ($err->no()) {
     if (!ttUserHelper::getUserByLogin($cl_login)) {
 
   if ($err->no()) {
     if (!ttUserHelper::getUserByLogin($cl_login)) {


@@ -159,6 +160,7 @@ if ($request->isPost()) {
         'rate' => $cl_rate,
         'quota_percent' => $cl_quota_percent,
         'group_id' => $user->getGroup(),
         'rate' => $cl_rate,
         'quota_percent' => $cl_quota_percent,
         'group_id' => $user->getGroup(),

+        'org_id' => $user->org_id,

         'role_id' => $cl_role_id,
         'client_id' => $cl_client_id,
         'projects' => $assigned_projects,
         'role_id' => $cl_role_id,
         'client_id' => $cl_client_id,
         'projects' => $assigned_projects,