Changeset 1999 for trunk/preferences

Timestamp:

02/10/10 15:37:22 (14 years ago)

Author:

amuller

Message:

Ticket #490 - #690 - Merge branches Expresso 2.2 com Trunk

Location:

trunk/preferences

Files:

• inc/class.uiconfig.inc.php (added)
• js/config.js (added)
• js/connector.js (added)
• preferences.php (modified) (3 diffs)
• templates/default/preferences.tpl (modified) (1 diff)

trunk/preferences/preferences.php

@@ -345 +345 @@
         function process_array(&$repository,$array,$notifys,$prefix='')
         {
+                $group_id = ($_POST['group']*1);        
                 $_appname = check_app();
 
@@ -397 +398 @@
                 {
                         return $error;
-                }
-                
-                $GLOBALS['phpgw']->preferences->save_repository(True,$GLOBALS['type']);
+                }       
+                $GLOBALS['phpgw']->preferences->save_repository(True,$GLOBALS['type'],$group_id);
                 
                 return False;
@@ -590 +590 @@
                 $t->set_var('tabs',$GLOBALS['phpgw']->common->create_tabs($tabs,$selected));
         }
+        if ($GLOBALS['type'] == 'forced')
+        {
+                $select_groups = '<script src="js/config.js"></script>
+                                  <script src="js/connector.js"></script>
+                                <td>'.lang('groups').':<input type="text" value="" size="30" onkeyup="search_user(this)">
+                                <span id="span_searching1"></span></td>
+                                <td><select name="group" id="searchu" style="width: 200px;" size="5" id="search"></td>';
+                $t->set_var('select_groups',$select_groups);
+        }
         $t->set_var('lang_submit', lang('save'));
         $t->set_var('lang_cancel', lang('cancel'));

trunk/preferences/templates/default/preferences.tpl

@@ -9 +9 @@
  {rows}
  <!-- END list -->
+  <tr>
+   {select_groups}
+  </tr>
   <tr height="30" valign="bottom">
   <td align="left">