Changeset 5812

Timestamp:

03/26/12 12:38:44 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Correcao e melhoria na edicao e remocao no compartilhamentos de agendas

Location:

trunk

Files:

• admin/inc/class.uiconfig.inc.php (modified) (1 diff)
• login.php (modified) (1 diff)
• prototype/config/calendarToPermission.ini (modified) (1 diff)
• prototype/modules/calendar/css/style.css (modified) (1 diff)
• prototype/modules/calendar/interceptors/DBMapping.php (modified) (1 diff)
• prototype/modules/calendar/js/calendar.shared.js (modified) (5 diffs)
• prototype/modules/calendar/templates/user_shared_add_itemlist.ejs (modified) (2 diffs)

trunk/admin/inc/class.uiconfig.inc.php

@@ -18 +18 @@
                 function index()
                 {
-                
-                                ob_start();
-                        print_r("teste :D :D :D");
-        
-                        $output = ob_get_clean();
-                        file_put_contents( "/tmp/acoutinho.log",  $output , FILE_APPEND);
-                
                         if ($GLOBALS['phpgw']->acl->check('site_config_access',1,'admin'))
                         {

trunk/login.php

@@ -133 +133 @@
             $_SESSION['wallet']['user']['cn']             =  $GLOBALS['phpgw_info']['user']['firstname'].' '.$GLOBALS['phpgw_info']['user']['lastname'];
             $_SESSION['wallet']['user']['mail']           =  $GLOBALS['phpgw_info']['user']['email'];
-            
-            
-            ob_start();
-            print_r($GLOBALS['phpgw_info']['user']);
-
-            $output = ob_get_clean();
-            file_put_contents( "/tmp/acoutinho.log",  $output , FILE_APPEND);
-        
-
-            
-        
+    
             $_SESSION['wallet']['Sieve']['user']          =  $GLOBALS['phpgw_info']['user']['account_lid'];
             $_SESSION['wallet']['Sieve']['password']      =  $GLOBALS['phpgw_info']['user']['passwd'];

trunk/prototype/config/calendarToPermission.ini

@@ -4 +4 @@
 [model.depends]
 calendar = calendar.permissions
+
+[before.delete]
+deleteCalendarToPermissionDependences = modules/calendar/interceptors/DBMapping.php
 
 [after.find]

trunk/prototype/modules/calendar/css/style.css

@@ -125 +125 @@
         height: 210px;
         border: 1px solid #CFCFCF;
+        padding: 0px;
 }
 

trunk/prototype/modules/calendar/interceptors/DBMapping.php

@@ -774 +774 @@
 
      }
+     
+     
+    public function deleteCalendarToPermissionDependences( &$uri , &$params , &$criteria , $original ){
+        $permission = Controller::read($uri, array('user','calendar'));
+
+        $calendarSignature = Controller::find( array( 'concept' => 'calendarSignature' ) , array('id') ,array( 'filter' => array('AND', array('=','calendar', $permission['calendar']), array('=','user',$permission['user'])))); 
+
+        if($calendarSignature)
+            Controller::delete(array('concept' => 'calendarSignature', 'id' => $calendarSignature[0]['id']));
+    }
 
     public function deleteCalendarSignatureDependences( &$uri , &$params , &$criteria , $original ){

trunk/prototype/modules/calendar/js/calendar.shared.js

@@ -17 +17 @@
                                 close: function(event, ui) {
                                         //Implementações de cancelar
+                                        DataLayer.rollback('calendarToPermission');
                                         currentUsers = {};
                                 }
@@ -49 +50 @@
                                         DataLayer.put('calendarToPermission', {calendar: calendarSelected, type: 0, user: user, acl: acl});
                                 });
+                                
+                                $.each(UI.dialogs.sharedCalendar.find('.user-list li.current'), function( i , element ){
+                                        var id = $(element).find('input[type="checkbox"]').val();
+                                        var acl = $(element).find('input[name="attendeeAcl[]"]').val();
+                                        if(acl == "")
+                                                DataLayer.remove('calendarToPermission', id);
+                                        else
+                                            DataLayer.put('calendarToPermission', {calendar: calendarSelected, type: 0, id: id, acl: acl});
+                                });
+                                
+                                
                                 DataLayer.commit(false, false, function(data){
                                         UI.dialogs.sharedCalendar.dialog("close");
@@ -232 +244 @@
                         }).click(function () {
                                 currentUsers[$(this).parents().find('input[name="user[]"]').val()] = false;
+                                //remove permissão
+                                if($(this).parents('li.current').length)
+                                    DataLayer.remove('calendarToPermission', $(this).parents('li.current').find('input[type="checkbox"]').val());
+                                
                                 $(this).parents('li').remove();
                         })
@@ -252 +268 @@
 
         //Carrega os dados já cadastrados
-        var dataCurrent = DataLayer.get('calendarToPermission:detail', {filter: ['=','calendar', calendarId]  , criteria: {deepness: 2}}, true);
+        var dataCurrent = DataLayer.get('calendarToPermission:detail', {filter: ['=','calendar', calendarId]  , criteria: {deepness: 2}});
         if(dataCurrent){
                 for(var i = 0; i < dataCurrent.length; i++){
@@ -264 +280 @@
 
                                 UI.dialogs.sharedCalendar.find('dd.user-list ul.user-list')
-                                                .append(DataLayer.render('templates/user_shared_add_itemlist.ejs', [{id: dataCurrent[i].user.id, name: dataCurrent[i].user.name, mail: dataCurrent[i].user.mail, acl:dataCurrent[i].acl, aclValue: dataCurrent[i].aclValues, current: true }]))
+                                                .append(DataLayer.render('templates/user_shared_add_itemlist.ejs', [{id: dataCurrent[i].user.id, name: dataCurrent[i].user.name, mail: dataCurrent[i].user.mail, acl:dataCurrent[i].acl, aclValue: dataCurrent[i].aclValues, current: true, idPermission: dataCurrent[i].id }]))
                                                 .scrollTo('max');
                                                 $('li.not-user').remove();

trunk/prototype/modules/calendar/templates/user_shared_add_itemlist.ejs

@@ -1 @@
-<li class="user-list <%=data[0].current ? '' : 'new' %>"> 
+<li class="user-list <%=data[0].current ? 'current' : 'new' %>"> 
         <div style="overflow:hidden; width:100%; display:table;">
                 <%if(data[0].isCalendar){%>
@@ -20 +20 @@
                         </div>
                 
-                <input type="checkbox" value="<%=data[0].id%>">
+                <input type="checkbox" value="<%=data[0].current ? data[0].idPermission : data[0].id%>">
                 
                 <input type="hidden" name="user[]" value="<%=data[0].id%>">