Merge remote branch 'upstream/master' into BUG-9962

2012-11-15 09:28:34 -04:00
parent 1a7cc3a34e 24f57e1899
commit d4cde83168
12 changed files with 50 additions and 39 deletions
--- a/workflow/engine/classes/class.applications.php
+++ b/workflow/engine/classes/class.applications.php
@@ -149,6 +149,7 @@ class Applications

        $Criteria->addAlias( 'CU', 'USERS' );
        $Criteria->addJoin( AppCacheViewPeer::USR_UID, 'CU.USR_UID', Criteria::LEFT_JOIN );
+        $Criteria->addAsColumn( 'USR_UID', 'CU.USR_UID' );
        $Criteria->addAsColumn( 'USR_FIRSTNAME', 'CU.USR_FIRSTNAME' );
        $Criteria->addAsColumn( 'USR_LASTNAME', 'CU.USR_LASTNAME' );
        $Criteria->addAsColumn( 'USR_USERNAME', 'CU.USR_USERNAME' );
--- a/workflow/engine/classes/class.dynaformEditor.php
+++ b/workflow/engine/classes/class.dynaformEditor.php
@@ -169,7 +169,7 @@ class dynaformEditor extends WebResource
            $oHeadPublisher->addScriptCode("var TRANSLATIONS = " . G::json_encode($labesTrans) . ";");
            $oHeadPublisher->setTitle(G::LoadTranslation('ID_DYNAFORM_EDITOR') . ' - ' . $Properties['DYN_TITLE']);
            $G_PUBLISH->AddContent('blank');
-            $this->panelConf['title'] = $this->title;
+            $this->panelConf['title'] = '';
            $G_PUBLISH->AddContent('panel-init', 'mainPanel', $this->panelConf);
            if ($Properties['DYN_TYPE'] == 'xmlform') {
                $G_PUBLISH->AddContent('xmlform', 'toolbar', 'dynaforms/fields_Toolbar', 'display:none', $Parameters, '', '');
--- a/workflow/engine/classes/class.toolBar.php
+++ b/workflow/engine/classes/class.toolBar.php
@@ -155,6 +155,29 @@ class XmlForm_Field_toolButton extends XmlForm_Field
            case 'text/image':
                $html = $this->htmlentities( $this->label, ENT_QUOTES, 'utf-8' ) . '<br/><img src="' . htmlentities( $url, ENT_QUOTES, 'utf-8' ) . '"' . (($this->style) ? ' style="' . $this->style . '"' : '') . '/>';
                break;
+            case 'dropdown':
+                $html = '';
+                if (isset($this->owner->values['PRO_UID'])) {
+                    G::LoadClass('processMap');
+                    $criteria = processMap::getDynaformsCriteria($this->owner->values['PRO_UID']);
+                    $dataset = DynaformPeer::doSelectRS($criteria);
+                    if ($dataset->getRecordCount() > 0) {
+                        $html .= '<span style="font-size: 8pt;margin-left: 20px;">' . G::LoadTranslation('ID_EDITING_DYNAFORM');
+                        $html .= ': <select onchange="window.location = \'dynaforms_Editor?PRO_UID=' . $this->owner->values['PRO_UID'];
+                        $html .= '&DYN_UID=\' + this.value;" class="module_app_input___gray">';
+                        $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+                        $dataset->next();
+                        while ($row = $dataset->getRow()) {
+                            $html .= '<option value="' . $row['DYN_UID'] . '"';
+                            $html .= ($this->owner->values['DYN_UID'] == $row['DYN_UID'] ? ' selected="selected"' : '') . '>';
+                            $html .= htmlentities($row['DYN_TITLE'], ENT_QUOTES, 'utf-8') . '</option>';
+                            $dataset->next();
+                        }
+                        $html .= '</select></span>';
+                    }
+                }
+                return $html;
+                break;
            case 'class':
                $html = '<a href="#" onclick="' . $this->onclick . '" onmouseover="backImage(this, \'url(/images/dynamicForm/hover.gif) no-repeat\')" onmouseout="backImage(this, \'\')"  style="width:25px;height:25px;margin-bottom:3px">
                 <div class="' . $this->class . '" title="' . strip_tags( $this->label ) . '" style="width:25px;height:25px;margin-bottom:3px"></div>
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -315,6 +315,8 @@ class workspaceTools
            } elseif ($first) {
                CLI::logging( "Updating XML form translations with $poName\n" );
                Language::import( $poFile, true, false );
+                CLI::logging( "Updating database translations with $poName\n" );
+                Language::import( $poFile, false, true );
            }
        }
    }
--- a/workflow/engine/skinEngine/base/extJsInitLoad.html
+++ b/workflow/engine/skinEngine/base/extJsInitLoad.html
@@ -35,7 +35,7 @@
    #loading-msg {
        font: bold 11px arial,tahoma,sans-serif;
    }
-    
+
  </style>
 </head>
 <body>
@@ -56,15 +56,9 @@
  <script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading UI Components...';</script>
  <script type='text/javascript' src='/js/ext/ext-all.js'></script>
  <script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading UI Extensions';</script>
-<!--  
-  <script type='text/javascript' src='/js/ext/wz_jsgraphics.js'></script>
-  <script type='text/javascript' src='/js/ext/mootools.js'></script>
-  <script type='text/javascript' src='/js/ext/moocanvas.js'></script>
-  !-->
-  <script type='text/javascript' src='/js/ext/draw2d.js'></script>
  <script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Initializing...';</script>
  {styles}
-  
+
  {bodyTemplate}
 </body>
 </html>
--- a/workflow/engine/skinEngine/simplified/extJsInitLoad.html
+++ b/workflow/engine/skinEngine/simplified/extJsInitLoad.html
@@ -36,7 +36,7 @@
    #loading-msg {
        font: bold 11px arial,tahoma,sans-serif;
    }
-    
+
  </style>
 </head>
 <body>
@@ -57,15 +57,9 @@
  <script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading UI Components...';</script>
  <script type='text/javascript' src='/js/ext/ext-all.js'></script>
  <script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading UI Extensions';</script>
-<!--  
-  <script type='text/javascript' src='/js/ext/wz_jsgraphics.js'></script>
-  <script type='text/javascript' src='/js/ext/mootools.js'></script>
-  <script type='text/javascript' src='/js/ext/moocanvas.js'></script>
-  !-->
-  <script type='text/javascript' src='/js/ext/draw2d.js'></script>
  <script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Initializing...';</script>
  {styles}
-  
+
  {bodyTemplate}
 </body>
 </html>
--- a/workflow/engine/skinEngine/uxmodern/extJsInitLoad.html
+++ b/workflow/engine/skinEngine/uxmodern/extJsInitLoad.html
@@ -35,7 +35,7 @@
    #loading-msg {
        font: bold 11px arial,tahoma,sans-serif;
    }
-    
+
  </style>
 </head>
 <body>
@@ -56,15 +56,9 @@
  <script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading UI Components...';</script>
  <script type='text/javascript' src='/js/ext/ext-all.js'></script>
  <script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading UI Extensions';</script>
-<!--  
-  <script type='text/javascript' src='/js/ext/wz_jsgraphics.js'></script>
-  <script type='text/javascript' src='/js/ext/mootools.js'></script>
-  <script type='text/javascript' src='/js/ext/moocanvas.js'></script>
-  !-->
-  <script type='text/javascript' src='/js/ext/draw2d.js'></script>
  <script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Initializing...';</script>
  {styles}
-  
+
  {bodyTemplate}
 </body>
 </html>
--- a/workflow/engine/skinEngine/uxs/extJsInitLoad.html
+++ b/workflow/engine/skinEngine/uxs/extJsInitLoad.html
@@ -35,7 +35,7 @@
    #loading-msg {
        font: bold 11px arial,tahoma,sans-serif;
    }
-    
+
  </style>
 </head>
 <body>
@@ -56,15 +56,9 @@
  <script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading UI Components...';</script>
  <script type='text/javascript' src='/js/ext/ext-all.js'></script>
  <script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading UI Extensions';</script>
-<!--  
-  <script type='text/javascript' src='/js/ext/wz_jsgraphics.js'></script>
-  <script type='text/javascript' src='/js/ext/mootools.js'></script>
-  <script type='text/javascript' src='/js/ext/moocanvas.js'></script>
-  !-->
-  <script type='text/javascript' src='/js/ext/draw2d.js'></script>
  <script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Initializing...';</script>
  {styles}
-  
+
  {bodyTemplate}
 </body>
 </html>
--- a/workflow/engine/templates/cases/casesList.js
+++ b/workflow/engine/templates/cases/casesList.js
@@ -491,7 +491,7 @@ Ext.onReady ( function() {
        return _FNF(s.data.USR_USERNAME, s.data.USR_FIRSTNAME, s.data.USR_LASTNAME);
      }
      else {
-        return '';
+        return '[' + _('ID_UNASSIGNED').toUpperCase() + ']';
      }
  };

--- a/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml
+++ b/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml
@@ -9,11 +9,11 @@
  <en>Enable HTML Editing</en>
 </PME_HTML_ENABLETEMPLATE>

-<PME_RESTORE_HTML type="button" onclick="dynaformEditor.restoreHTML();">
+<PME_RESTORE_HTML type="button" onclick="dynaformEditor.restoreHTML(); this.blur();">
 <en>Restore Original HTML</en>
 </PME_RESTORE_HTML>

-<PME_REFRESH_VIEW type="button" onclick="html2_html();">
+<PME_REFRESH_VIEW type="button" onclick="html2_html(); this.blur();">
 <en>Refresh View</en>
 </PME_REFRESH_VIEW>

@@ -79,13 +79,14 @@ getField("PME_HTML_ENABLETEMPLATE","dynaforms_HtmlEditor").onclick=function()
            label: "@G::LoadTranslation(ID_MSG_ENABLE_HTML_EDITING)",
            size:{ w: 350, h: 150 },
            action: function() { },
-            cancel: function() { 
+            cancel: function () {
                getField("PME_HTML_ENABLETEMPLATE","dynaforms_HtmlEditor").checked = false;
            }
        });
-        dynaformEditor.setEnableTemplate( this.checked ); 
+
+        dynaformEditor.setEnableTemplate(this.checked);
    }
 }
 ]]></PME_RESIZE_JS>

-</dynaForm>  
+</dynaForm>
--- a/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml
+++ b/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <dynaForm name="fields_Toolbar" version="1.0" type="toolbar" align="left" width="100%">
+  <PRO_UID type="private" />
+  <DYN_UID type="private" />
  <separator1 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
  <saveDyna type="toolButton" class="ss_sprite button_toolbar ss_disk" onclick="dynaformEditor.save()" home="public_html" buttonType="class">
    <en>Save</en>
@@ -92,4 +94,6 @@
  <grid type="toolButton" class="ss_sprite button_toolbar ss_table" onclick="fieldsAdd('grid')" buttonType="class">
    <en>Grid</en>
  </grid>
+  <separator10 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
+  <dynaforms type="toolButton" class="" onclick="" buttonType="dropdown" />
 </dynaForm>
--- a/workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml
+++ b/workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <dynaForm name="fields_Toolbar" version="1.0" type="toolbar" align="left" width="894px">
+  <PRO_UID type="private" />
+  <DYN_UID type="private" />
  <separator1 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
  <saveDyna type="toolButton" class="ss_sprite button_toolbar ss_disk" onclick="dynaformEditor.save()" buttonType="class">
    <en>Save</en>
@@ -49,4 +51,6 @@
  <file type="toolButton" class="ss_sprite button_toolbar ss_upload" onclick="fieldsAdd('file')" buttonType="class">
    <en>File</en>
  </file>
+  <separator10 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
+  <dynaforms type="toolButton" class="" onclick="" buttonType="dropdown" />
 </dynaForm>