Changeset 3060 for sandbox/workflow/trunk/js

Timestamp:

07/15/10 17:30:07 (14 years ago)

Author:

viani

Message:

Ticket #950 - Merged 2838:3056 /trunk/workflow em /sandbox/workflow/trunk

Location:

sandbox/workflow/trunk/js

Files:

• htmlarea/plugins/UploadImage/popups/ImageEditor/Transform.php (modified) (1 diff)
• jscode/participants.js (modified) (10 diffs)
• jscode/wf_file_upload.js (modified) (2 diffs)
• jscode/wf_select_ldap_users.js (modified) (3 diffs)

sandbox/workflow/trunk/js/htmlarea/plugins/UploadImage/popups/ImageEditor/Transform.php

@@ -130 +130 @@
 
         $classname = "Image_Transform_Driver_{$driver}";
-        $obj =& new $classname;
+        $obj = new $classname;
         return $obj;
     }

sandbox/workflow/trunk/js/jscode/participants.js

@@ -1 +1 @@
 var participantsClone = null;
+var chkOnlyVisibleAccountsClone = null;
 var searchTimer = null;
 var globalSearchEnter = true;
@@ -23 +24 @@
         var params = {
                 organization: $F('organization'),
+                onlyVisibleAccounts: $F('onlyVisibleAccounts'),
                 entities: $F('entities'),
                 id: $F('id'),
@@ -34 +36 @@
         var params = {
                 context: $F('sector'),
+                onlyVisibleAccounts: $F('onlyVisibleAccounts'),
                 entities: $F('entities'),
                 id: $F('id'),
@@ -46 +49 @@
         setSelectValue($('participants'), data);
         participantsClone = data;
+        if($('onlyVisibleAccounts'))
+                chkOnlyVisibleAccountsClone = $('onlyVisibleAccounts').checked;
 }
 
@@ -63 +68 @@
         var reg = new RegExp("<option[^>]*>[^<]*" + searchString + "[^<]*<\/option>", "gi");
         setSelectValue($('participants'), participantsClone.match(reg));
+        if($('onlyVisibleAccounts'))
+                $('onlyVisibleAccounts').checked = chkOnlyVisibleAccountsClone;
 
         var participants = $('participants');
@@ -126 +133 @@
 
                 obj = $('participants');
-                if (obj)
+                if (obj){
                         participantsClone = obj.innerHTML;
+                        if($('onlyVisibleAccounts'))
+                                chkOnlyVisibleAccountsClone = $('onlyVisibleAccounts').checked;
+                }
 
                 obj = $('exitLink');
@@ -140 +150 @@
                 if (obj)
                         obj.focus();
+
+                obj = $('onlyVisibleAccounts');
+                if (obj)
+                        obj.onclick = checkOnlyVisibleAccounts;
 
                 obj = $('useGlobalSearch');
@@ -149 +163 @@
         });
 };
+
+function checkOnlyVisibleAccounts()
+{
+        if(!$('useGlobalSearch').checked)
+                getParticipants();
+        else
+                toggleFullSearch();
+}
 
 function participantsFilterName(name)
@@ -330 +352 @@
         $('globalSearchWarnings').innerHTML = '';
         var params = {
+                onlyVisibleAccounts: $F('onlyVisibleAccounts'),
                 searchTerm: $F('search'),
                 entities: $F('entities'),
@@ -341 +364 @@
 {
         newWidth   = 500;
-        newHeight  = 290;
+        newHeight  = 315;
         newScreenX = screen.width - newWidth;
         newScreenY = 0;

sandbox/workflow/trunk/js/jscode/wf_file_upload.js

@@ -149 +149 @@
                 };
 
+
+
                 // Set row value
                 new_row.innerHTML = element.value + '  ';
@@ -160 +162 @@
         };
 
+        this.removeFile = function (me, nome){
+                me.parentNode.parentNode.removeChild(me.parentNode);
+                hd = document.getElementById("hd_remover_anexos");
+                hd.value += nome+"; ";
+        }
+
 };

sandbox/workflow/trunk/js/jscode/wf_select_ldap_users.js

@@ -9 +9 @@
  * @param String opt_name Atributo que será atribuído ao name (innerHTML) das options da combo, por padrão é o 'cn'
  */
-function search_ldap_users_by_cn(cn, target, opt_id, opt_name, handleExpiredSessions)
-{
+function search_ldap_users_by_cn(cn, target, opt_id, opt_name, handleExpiredSessions, opt_complement)
+{  
+        // o parâmetro opt_complement foi acrescentado posteriormente a esta função, devido alguns métodos não utilizá-lo é
+        // necessário fazer o tratamento do mesmo caso não seja passado.
+        if(opt_complement == undefined)
+                opt_complement = '';
+
 /* Método que trata o retorno da chamada Ajax. Atribui os valores retornados à combobox */
         function result_search_ldap_users_by_cn(data)
@@ -35 +40 @@
                         var container = document.getElementById(data["target"]);
                         container.innerHTML = "";
-                        if(data['values'].length > 1){
+                        if(data['values'].length >= 1){
                                 container.disabled = true;
                                 fill_combo_employee(data["target"], data["values"]);
@@ -44 +49 @@
                         }
                 }
+
+                return false;
         }
 
         var url = '$this.bo_utils.search_ldap_users_by_cn';
-        var param = "cn=" + cn + "&target=" + target + "&id=" + opt_id + "&name=" + opt_name;
+        var param = "cn=" + cn + "&target=" + target + "&id=" + opt_id + "&name=" + opt_name + "&complement=" + opt_complement;
 
         document.getElementById(target + "_img").show();