Changeset 5530

Timestamp:

02/18/12 16:59:58 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Correcoes de bugs e estabilizacao da troca de views

Location:

trunk

Files:

• expressoMail1_2/index.php (modified) (2 diffs)
• prototype/api/datalayer.js (modified) (1 diff)
• prototype/modules/calendar/js/calendar.codecs.js (modified) (2 diffs)
• prototype/modules/calendar/js/helpers.js (modified) (2 diffs)

trunk/expressoMail1_2/index.php

@@ -56 +56 @@
                                         <link rel="stylesheet" type="text/css" href="../prototype/plugins/contextmenu/jquery.contextMenu.css"></link>
                                         <link rel="stylesheet" type="text/css" href="../prototype/plugins/zebradialog/css/zebra_dialog.css"></link>
+                                        <link rel="stylesheet" type="text/css" href="../prototype/plugins/fileupload/jquery.fileupload-ui.css"></link>
                                         <script type="text/javascript" src="../prototype/plugins/zebradialog/javascript/zebra_dialog.js"></script>
                                         <script type="text/javascript" src="../prototype/plugins/datejs/date-pt-BR.js"></script>
@@ -73 +74 @@
                                         <script type="text/javascript" src="../prototype/plugins/qtip/jquery.qtip-1.0.0-rc3.min.js"></script>
                                         <script type="text/javascript" src="../prototype/plugins/contextmenu/jquery.contextMenu.js"></script>
+                                        <script type="text/javascript" src="../prototype/plugins/fileupload/jquery.fileupload.js"></script>
+                                        <script type="text/javascript" src="../prototype/plugins/fileupload/jquery.iframe-transport.js"></script>
                                         <!-- <script type="text/javascript" src="../prototype/plugins/contextmenu/jquery.ui.position.js"></script> -->
                                         <script language="javascript">var CalendarBkp = Calendar;</script>

trunk/prototype/api/datalayer.js

@@ -1068 +1068 @@
         var result = false;
 
+        /*
+        *  TODO - Para correta aplicação de filtros campos com valores de datas
+        * devem ter tratamento diferenciado, sendo que como string os mesmos não serão 
+        * corretamente tratados. 
+        */
+        
         if( bothSides || !oneSide )
-            result = this.check( concept, id || filter );
-
+            //result = this.check( concept, id || filter );
+                result = false;
         if( !result && (bothSides || oneSide) )
         {

trunk/prototype/modules/calendar/js/calendar.codecs.js

@@ -52 +52 @@
       
         encoder: function( signatures ){
-
                 return $.map( signatures, function( signature ){
                         return { events: function( start, end, callback ){
@@ -79 +78 @@
         load: function(){
                 this.lastView = 0;
-                DataLayer.remove("calendarSignature", false);
-                this.signatures  = DataLayer.get("calendarSignature", {filter: ['=', 'user', User.me.id], criteria: {deepness: 2}});
+                /*
+                * TODO - Devida mudança na API os dados na camada javaScript não são alterados
+                *  quando forçado um get do banco, deverá ser criado uma condição para o mesmo
+                */
+                var descart = DataLayer.get("calendarSignature", {filter: ['=', 'user', User.me.id], criteria: {deepness: 2}})
+                this.signatures  = DataLayer.get("calendarSignature", {filter: ['=', 'user', User.me.id], criteria: {deepness: 2}}, true);
           
                 var prevSources = this.sources;

trunk/prototype/modules/calendar/js/helpers.js

@@ -107 +107 @@
                 }).click(function () {
                         DataLayer.remove('participant', $(this).parents('li').find('[type=checkbox]').val());
+                        if($(this).parent().find('.button.delegate').hasClass('attendee-permissions-change-button')){
+                                
+                                blkAddAtendee.find('.request-update').addClass('hidden');
+                                blkAddAtendee.find('.status option').toggleClass('hidden');
+                                
+                                blkAddAtendee.find('option[value=1]').attr('selected','selected').trigger('change');
+                        }
+                        
                         $(this).parents('li').remove();
+                        
                         if(blkAddAtendee.find(".attendee-list li").length == 1)
                                 blkAddAtendee.find("li.not-attendee").removeClass('hidden');
@@ -946 +955 @@
                         }else
                                 $('.progress.on-complete:first').removeClass('on-complete').parents('p').find('.status-upload').addClass('ui-icon ui-icon-cancel');
-                                
-                        console.log("oi doen");
                 }
         });