Changeset 8232 for branches/2.5/prototype/modules/calendar/js/calendar.shared.js

Timestamp:

10/08/13 16:20:46 (11 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final 2.5.1.

File:

• branches/2.5/prototype/modules/calendar/js/calendar.shared.js (modified) (3 diffs)

branches/2.5/prototype/modules/calendar/js/calendar.shared.js

@@ -75 +75 @@
             });
 
-            DataLayer.commit();
-            UI.dialogs.sharedCalendar.dialog("close");
+            DataLayer.commit(false, false, function(result){
+
+            /*
+             * Force clean cache
+             * */
+            DataLayer.storage.cache = {};
+            UI.dialogs.sharedCalendar.dialog("close");
+
+        });
+
         };
 
@@ -295 +303 @@
 
     //Carrega os dados já cadastrados
-    var dataCurrent = DataLayer.get('calendarToPermission:detail', {
-        filter: ['=','calendar', calendarId]  , 
-        criteria: {
-            deepness: 2
-        }
-    });
-    if(dataCurrent){
-        for(var i = 0; i < dataCurrent.length; i++){
-            if(dataCurrent[i].user == "0"){
-                UI.dialogs.sharedCalendar.find('input[name="isPublic"]').attr('checked', 'checked')
-                .parent().find('.free-busy').toggleClass('hidden');
-                if(dataCurrent[i].acl['busy'])
-                    UI.dialogs.sharedCalendar.find('input[name="busy"]').attr('checked', 'checked');
-            }else{
-                currentUsers[dataCurrent[i].user.id] = true;
-
-                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, 
-                    idPermission: dataCurrent[i].id
-                }]))
-                .scrollTo('max');
-                $('li.not-user').remove();
-                callbackSharedCotactsAdd();
-
-                for (var f in dataCurrent[i].acl){
-                    if(dataCurrent[i].acl[f]){
-                        UI.dialogs.sharedCalendar.find('.'+f+':last').toggleClass('attendee-permissions-change-button')
-                        .find('span:first').toggleClass('attendee-permissions-change').end();  
-                    }
-                }
-            }
-        }
-    }
+    var loadOldData = function (calendar)
+    {
+        UI.dialogs.sharedCalendar.find('dd.user-list ul.user-list').empty();
+
+        var dataCurrent = DataLayer.get('calendarToPermission:detail', {
+            filter: ['=','calendar', calendar]  ,
+            criteria: {
+                deepness: 2
+            }
+        });
+
+        if(dataCurrent){
+            for(var i = 0; i < dataCurrent.length; i++){
+                if(dataCurrent[i].user == "0"){
+                    UI.dialogs.sharedCalendar.find('input[name="isPublic"]').attr('checked', 'checked')
+                        .parent().find('.free-busy').toggleClass('hidden');
+                    if(dataCurrent[i].acl['busy'])
+                        UI.dialogs.sharedCalendar.find('input[name="busy"]').attr('checked', 'checked');
+                }else{
+                    currentUsers[dataCurrent[i].user.id] = true;
+
+                    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,
+                            idPermission: dataCurrent[i].id
+                        }]))
+                        .scrollTo('max');
+                    $('li.not-user').remove();
+                    callbackSharedCotactsAdd();
+
+                    for (var f in dataCurrent[i].acl){
+                        if(dataCurrent[i].acl[f]){
+                            UI.dialogs.sharedCalendar.find('.'+f+':last').toggleClass('attendee-permissions-change-button')
+                                .find('span:first').toggleClass('attendee-permissions-change').end();
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    loadOldData(calendarId);
+
+    //Bind calendar select change
+    var select = UI.dialogs.sharedCalendar.find('select[name="calendar"]');
+    select.change(function() {
+        loadOldData(select.val());
+    });
+
     UI.dialogs.sharedCalendar.dialog('open');
 }
@@ -526 +549 @@
     for (var i = 0; i < Calendar.signatures.length; i++)
         if(Calendar.signatures[i].isOwner == "0"){
+
+        /*
+        * Verificar se o Owner é um objeto caso ao contrário é realizado a busca e adicionado ao mesmo o uid
+        * */
+        if (Calendar.signatures[i].permission.owner != "object"){
+
+            var result = DataLayer.get('calendarToPermission', {
+                filter: ['AND', ['=','id', Calendar.signatures[i].permission.id]]  ,
+                criteria: {
+                    deepness: 2
+                }
+            }, true);
+
+            Calendar.signatures[i].permission.owner = {};
+            Calendar.signatures[i].permission.owner['uid'] = result[0].owner.uid;
+
+        }
+
             var dataCurrent = Calendar.signatures[i].calendar;
             currentCalendars[Calendar.signatures[i].permission.id] = {