Changeset 8205 for trunk

Timestamp:

08/27/13 10:39:15 (10 years ago)

Author:

cristiano

Message:

Ticket #3482 - Inconsistências na tela de compartilhamento de agendas

Location:

trunk/prototype/modules/calendar

Files:

• js/calendar.shared.js (modified) (1 diff)
• templates/shared_calendar.ejs (modified) (2 diffs)

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

@@ -303 +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');
 }

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

@@ -7 +7 @@
                                 <dd class="calendar">
                                         <select class="calendar" name="calendar">
-                                                        <%                                                      
-                                                        for(var i = 0; i < data.calendar.length; i++){
-                                                                if(data.signature[i].permission){
-                                                                        if(data.signature[i].permission.acl.shared == false)
-                                                                                continue;
-                                                                }
-                                                        %>
-                                                                <option value="<%=data.calendar[i].id%>"><%=data.calendar[i].name%></option>
+                        <%
+                        for(var i = 0; i < data.calendar.length; i++)
+                        {
+                            for(var ii = 0; ii < data.signature.length; ii++)
+                            {
+                                if(data.signature[ii].calendar.id === data.calendar[i].id && data.signature[ii].permission)
+                                {
+                                    if(data.signature[ii].permission.acl.shared == false)
+                                        continue;
+                                }
+                            }
+                        %>
+                                                <option value="<%=data.calendar[i].id%>"><%=data.calendar[i].name%></option>
                                                                         
                                                         <% 
@@ -24 +29 @@
                         <dd class="<%=data.calendar ? "user-list" : "calendar-list"%>">
                                 <ul class="user-list">
-                                <% if (false) {
-                                        for (var i=0; i< data.event.user.length; i++) {%>
-                                                <li class="user"> 
-                                                        <div style="overflow:hidden; width:100%; display:table;">
-                                                                <input type="checkbox" value="">
-                                                                <input type="hidden" name="user[]" value="">
-                                                                <label class="name"></label>
-                                                                <label class="mail"></label>
-                                                        </div> 
-                                                        <div class="shared-acl">
-                                                                        <a class="button edit user-options-button-edit new">Editar permissões</a>
-                                                                        <a class="button close new">Remover</a>
-                                                        </div>
-                                                </li>   
-                                        <%} 
-                                } else { %>
                                         <li class="not-user"><%=data.calendar ? "Não compartilhado." : "Nenhuma agenda selecionada"%></li>
-                                <% } %>
                                 </ul>
                         </dd>