Changeset 12731
- Timestamp:
- 10/10/07 14:07:44 (1 year ago)
- Files:
-
- trunk/midcom/midcom.admin.user/config/config.inc (modified) (1 diff)
- trunk/midcom/midcom.admin.user/config/schemadb_account.inc (added)
- trunk/midcom/midcom.admin.user/config/schemadb_person.inc (modified) (1 diff)
- trunk/midcom/midcom.admin.user/handler/user/edit.php (modified) (3 diffs)
- trunk/midcom/midcom.admin.user/plugin.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/midcom/midcom.admin.user/config/config.inc
r12708 r12731 1 1 'schemadb_person' => 'file:/midcom/admin/user/config/schemadb_person.inc', 2 'schemadb_account' => 'file:/midcom/admin/user/config/schemadb_account.inc', 2 3 'schemadb_group' => 'file:/midcom/admin/user/config/schemadb_group.inc', 3 4 'list_without_search' => 20, trunk/midcom/midcom.admin.user/config/schemadb_person.inc
r12724 r12731 6 6 'fields' => array 7 7 ( 8 'username' => array9 (10 // COMPONENT-REQUIRED11 'title' => 'username',12 'storage' => 'username',13 'type' => 'text',14 'widget' => 'text',15 'index_method' => 'noindex',16 ),17 8 'firstname' => array 18 9 ( trunk/midcom/midcom.admin.user/handler/user/edit.php
r12729 r12731 48 48 * Loads and prepares the schema database. 49 49 */ 50 function _load_schemadb( )50 function _load_schemadb($config_key) 51 51 { 52 $this->_schemadb = midcom_helper_datamanager2_schema::load_database($this->_config->get( 'schemadb_person'));52 $this->_schemadb = midcom_helper_datamanager2_schema::load_database($this->_config->get($config_key)); 53 53 } 54 54 … … 60 60 function _load_controller() 61 61 { 62 $this->_load_schemadb();63 62 $this->_controller =& midcom_helper_datamanager2_controller::create('simple'); 64 63 $this->_controller->schemadb =& $this->_schemadb; … … 95 94 96 95 $data['asgard_toolbar'] = new midcom_helper_toolbar(); 96 97 98 if ($handler_id == '____mfa-asgard_midcom.admin.user-user_edit_password') 99 { 100 $this->_load_schemadb('schemadb_account'); 101 } 102 else 103 { 104 $this->_load_schemadb('schemadb_person'); 105 } 97 106 98 107 $this->_load_controller(); trunk/midcom/midcom.admin.user/plugin.php
r12716 r12731 64 64 ), 65 65 /** 66 * Edit a user's password 67 * 68 * Match /user-editor/edit/<guid>/ 69 */ 70 'user_edit_password' => array 71 ( 72 'handler' => array ('midcom_admin_user_handler_user_edit', 'edit'), 73 'fixed_args' => array ('password'), 74 'variable_args' => 1, 75 ), 76 /** 66 77 * Create new user 67 78 *
