Changeset 5850 for trunk/expressoAdmin1_2

Timestamp:

03/29/12 16:32:30 (12 years ago)

Author:

acoutinho

Message:

Ticket #2577 - Problemas com a criacaoo/Edicao de contas compartilhadas

Location:

trunk/expressoAdmin1_2

Files:

• inc/class.imap_functions.inc.php (modified) (1 diff)
• inc/class.uishared_accounts.inc.php (modified) (1 diff)
• js/jscode/shared_accounts.js (modified) (4 diffs)
• templates/default/shared_accounts_modal.tpl (modified) (2 diffs)

trunk/expressoAdmin1_2/inc/class.imap_functions.inc.php

@@ -457 +457 @@
         function getTemplate( $tpls, $macros, $target = false )
         {
-            require_once( ROOT.'header.inc.php' );
+            require_once( ROOT.'/header.inc.php' );
 
             $template = CreateObject( 'phpgwapi.Template', PHPGW_APP_TPL );

trunk/expressoAdmin1_2/inc/class.uishared_accounts.inc.php

@@ -107 +107 @@
                             'display_quota_used' => 'none',
                             'aclExpressoCalendar' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'expressoCalendar')) ? '' : 'none',
-                            'aclCalendar' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? '' : 'none'
+                            'aclCalendar' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? '' : 'none',
+                            'calendarName' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? 'Calendar' : 'ExpressoCalendar'
                         );
                         $p->set_var($var);

trunk/expressoAdmin1_2/js/jscode/shared_accounts.js

@@ -212 +212 @@
 
             var sharedUser = DataLayer.get('user', {filter: ['=','mail',$('#mail').val()]});
-            var signature = DataLayer.get('calendarSignature', {filter: ['=','user', sharedUser[0].id]});
-
-            var usuario = DataLayer.get('user', {filter: ['AND', ['=','uid',user], ['*','mail',user] ]});
-            var calendarPermission = DataLayer.get('calendarToPermission', {filter: ['AND', ['=','calendar',signature[0].calendar], ['=','user',usuario[0].id] ] });
+            for(var i = 0; i < sharedUser.length; i++)
+                if(sharedUser[i].phpgwAccountType == 's'){
+                    sharedUser = sharedUser[i];
+                    break;
+                }
+
+            var signature = DataLayer.get('calendarSignature', {filter: ['=','user', sharedUser.id]});
+
+            if(!signature)
+                return;
+
+            var usuario = DataLayer.get('user', {filter: ['=','uid',user], criteria: {notExternal: true}});
+            var calendarPermission = DataLayer.get('calendarToPermission', {filter: ['AND', ['=','calendar',signature[0].calendar], ['=','user',usuario[0].id] ]});
 
             var signatureUser = DataLayer.get('calendarSignature', {filter: ['AND', ['=','calendar', signature[0].calendar], ['=','user', usuario[0].id ] ]});
 
-            DataLayer.remove('calendarSignature', signatureUser[0].id);
-            DataLayer.remove('calendarToPermission', calendarPermission[0].id);
+            if(!!signatureUser && signatureUser[0].id)
+                DataLayer.remove('calendarSignature', signatureUser[0].id);
+            
+            if(!!calendarPermission && calendarPermission[0].id)
+                DataLayer.remove('calendarToPermission', calendarPermission[0].id);
 
         }
@@ -377 +389 @@
 
                 if(!!sharedUser && $.isArray(sharedUser))
-                    sharedUser = sharedUser[0];
+                    for(var i = 0; i < sharedUser.length; i++)
+                        if(sharedUser[i].phpgwAccountType == 's'){
+                            sharedUser = sharedUser[i];
+                            break;
+                        }
 
                 if(!!!sharemailbox.currentPemissions[sharedUser.id])
@@ -410 +426 @@
                 $.each(sharemailbox.ownersExpressoCalendarAcl, function(user, acl) {
 
-                        var usuario = DataLayer.get('user', {filter: ['AND', ['=','uid',user], ['*','mail',user] ]});
+                        var usuario = DataLayer.get('user', {filter: ['=','uid',user], criteria: {notExternal: true}});
 
                         if($.isArray(usuario))
                             usuario = usuario[0];
 
-                        
                         DataLayer.put('calendarToPermission', DataLayer.merge({
                             user:  usuario.id,
@@ -455 +470 @@
 function handler_save_shared_accounts2(data_return)
 {
-        if (!data_return.status)
-        {
-                write_msg(data_return.msg, 'error');
-        }
-        else
-        {
-                
-                hidden_owners_acl.value = "";
+        if(data_return){
+            if (data_return.status){
+                hidden_owners_acl.value = "";
                 close_lightbox();
                 write_msg(get_lang('Shared account successful saved') + '.', 'normal');
+            }else
+                write_msg(data_return.msg , 'error');    
         }
         return;

trunk/expressoAdmin1_2/templates/default/shared_accounts_modal.tpl

@@ -50 +50 @@
                         <tbody>
                                 <tr>
-                                    <td colspan="2" width="125"><b>{lang_calendar}:</b></td>
+                                    <td colspan="2" width="125"><b>{lang_calendar}: {calendarName}</b></td>
                                 </tr>
                                 <tr>
@@ -72 +72 @@
                         <tbody>
                                 <tr>
-                                    <td colspan="2" width="125"><b>{lang_calendar}:</b></td>
+                                    <td colspan="2" width="125"><b>{lang_calendar}: {calendarName}</b></td>
                                 </tr>
                                 <tr>