Changeset 7041 for trunk/prototype

Timestamp:

08/16/12 16:13:04 (12 years ago)

Author:

acoutinho

Message:

Ticket #3039 - Inconsistencia com compartilhamento de agendas

Location:

trunk/prototype

Files:

• Sync.php (modified) (1 diff)
• modules/calendar/css/layout.css (modified) (5 diffs)
• modules/calendar/interceptors/DBMapping.php (modified) (1 diff)
• modules/calendar/js/calendar.codecs.js (modified) (3 diffs)

trunk/prototype/Sync.php

@@ -9 +9 @@
         $vars = array();
 
-        $input    = $_SERVER['REDIRECT_QUERY_STRING'];
+        if(isset($_SERVER['REDIRECT_QUERY_STRING']))
+            $input    = $_SERVER['REDIRECT_QUERY_STRING'];
+
         if(!empty($input)){
             $pairs    = explode("&", $input);

trunk/prototype/modules/calendar/css/layout.css

@@ -193 +193 @@
         display: inline-block;
         border: none;
-        width: 215px;
+        width: 213px;
 }
 
@@ -264 +264 @@
 
 #calendar_addactivity_details8 .block-attendee-list, #calendar_addactivity_details8 .block-activity-list { width:430px; margin-right: 5px; }
+
+div.assing-calendar dl.block-add-user.search{width: 255px;} 
+div.assing-calendar dt.add-user.search{width: 120px;} 
+
 
 .block-activity-list, .block-activity-group-select{width: 405px}
@@ -538 +542 @@
 
 .shared-calendar .user-list li.user-list{
-        height: 17px;
+        height: 20px;
         overflow: hidden;
         position: relative;
@@ -552 +556 @@
     height: 210px;
 }
+
+//Remover bordas indesejáveis no Ie
+input[type="checkbox"]{border: none 0px;}
 
 .user-acls-shared-calendar{
@@ -683 +690 @@
 .add-user fieldset.block-add-user{
         width: 245px;
+}
+
+div.assing-calendar .add-user fieldset.block-add-user{
+    width: 234px;
+    margin: 0;
+    padding: 0;
 }
 

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

@@ -699 +699 @@
     }
 
-    public function deepnessFindCalendarShared(&$uri, &$result, &$criteria, $original) {
-        if (isset($original['criteria']['deepness']) && $original['criteria']['deepness'] != '0' && count($result) > 0) {
-
-            $calendarIds = array();
-            foreach ($result as $key => $value)
-                array_push($calendarIds, $value['calendar']);
-
-            $calendar = Controller::find(array('concept' => 'calendar'), false, array('filter' => array('AND', array('IN', 'id', $calendarIds), $original['criteria']['filter'])));
-
-            if ($calendar && count($calendar) > 0){
-                $newResult = array();
-                foreach ($calendar as $key => $value) {
-                    foreach ($result as $k => $r) {
-
-                        if ($r['calendar'] == $value['id']) {
-                            $r['calendar'] = $value;
-                            array_push($newResult, $r);
-                        }
-                    }
-                }
-
-                foreach ($newResult as $key => &$value) {
-                    if ($value['user'] != 0) {
-                        $user = $value['user'];
-                        $value['user'] = Controller::read(array('concept' => 'user', 'id' => $user));
-
-                        if (!$value['user'])
-                            $value['user'] = Controller::read(array('concept' => 'group', 'id' => $user));
-                    }
-                }
-
-                $result = $newResult;
-            }else
-                $result = '';
-        }
+    public function deepnessFindCalendarShared(&$uri, &$result, &$criteria, $original) {    
+        if (isset($original['criteria']['deepness']) && $original['criteria']['deepness'] != '0' && count($result) > 0) {
+
+            $calendarIds = array();
+            foreach ($result as $key => $value)
+                array_push($calendarIds, $value['calendar']);
+
+            $calendar = Controller::find(array('concept' => 'calendar'), false, array('filter' => array('AND', array('IN', 'id', $calendarIds))));
+
+            if ($calendar && count($calendar) > 0){
+                $newResult = array();
+                        foreach ($calendar as $key => $value) {
+                            foreach ($result as $k => $r) {
+
+                                if ($r['calendar'] == $value['id']) {
+                                    $r['calendar'] = $value;
+                                    array_push($newResult, $r);
+                                }
+                            }
+                        }
+
+                        foreach ($newResult as $key => &$value) {
+                            if ($value['user'] != 0) {
+                                $user = $value['user'];
+                                $value['user'] = Controller::read(array('concept' => 'user', 'id' => $user));
+
+                                if (!$value['user'])
+                                    $value['user'] = Controller::read(array('concept' => 'group', 'id' => $user));
+                            }
+                        }
+
+                        $result = $newResult;
+            }else
+                  $result = '';
+        }
     }
 

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

@@ -57 +57 @@
         importCalendar: null,
         sharedCalendar: null,
-        copyCalendar: null
+        copyCalendar: null,
+    assingCalendar: null
     }
 }
@@ -902 +903 @@
         'priority': 'Prioridade',
         'due' : 'Previsão de término'
-    }
+    };
     
     var statusDecoded = {
@@ -908 +909 @@
         2: 'Em processo',
         3: 'Finalzada',
-        4: 'Cancelada',
-    }
+        4: 'Cancelada'
+    };
 
     var decodeDate = function(time){