details:   /erp/devel/pi/rev/fcf6f3cfba7c
changeset: 13076:fcf6f3cfba7c
user:      Martin Taal <martin.taal <at> openbravo.com>
date:      Sat Jul 02 16:28:28 2011 +0200
summary:   Related to issue 17869: Save and close does not work
Added saverow to save and close

details:   /erp/devel/pi/rev/553f054bca47
changeset: 13077:553f054bca47
user:      Martin Taal <martin.taal <at> openbravo.com>
date:      Sat Jul 02 16:29:03 2011 +0200
summary:   Solve issue that save action is fired on new in form

details:   /erp/devel/pi/rev/44f9c43a4fe3
changeset: 13078:44f9c43a4fe3
user:      Martin Taal <martin.taal <at> openbravo.com>
date:      Sat Jul 02 16:29:42 2011 +0200
summary:   Fixes issue 17836: Add Jump-to-selected-row in grid
Made select count clickable, changed style

diffstat:

 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
                                                                               
|  11 +++
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
                                                            |  31 +++++++++-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
                                                        |   2 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
                                                           |   1 +
 
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css
 |   1 +
 
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-grid-styles.css
 |   6 +
 6 files changed, 50 insertions(+), 2 deletions(-)

diffs (122 lines):

diff -r 1f5cb2534ee6 -r 44f9c43a4fe3 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
--- 
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
        Fri Jul 01 23:57:38 2011 +0200
+++ 
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
        Sat Jul 02 16:29:42 2011 +0200
@@ -2497,4 +2497,15 @@
 <!--FF80818130556AB8013055957E1B0047-->  
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--FF80818130556AB8013055957E1B0047--></AD_MESSAGE>
 
+<!--FF80818130EB258F0130EB26AFE20009--><AD_MESSAGE>
+<!--FF80818130EB258F0130EB26AFE20009-->  
<AD_MESSAGE_ID><![CDATA[FF80818130EB258F0130EB26AFE20009]]></AD_MESSAGE_ID>
+<!--FF80818130EB258F0130EB26AFE20009-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF80818130EB258F0130EB26AFE20009-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF80818130EB258F0130EB26AFE20009-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF80818130EB258F0130EB26AFE20009-->  
<VALUE><![CDATA[OBUIAPP_ClickSelectedCount]]></VALUE>
+<!--FF80818130EB258F0130EB26AFE20009-->  <MSGTEXT><![CDATA[Click to scroll to 
the first selected row]]></MSGTEXT>
+<!--FF80818130EB258F0130EB26AFE20009-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF80818130EB258F0130EB26AFE20009-->  
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF80818130EB258F0130EB26AFE20009--></AD_MESSAGE>
+
 </data>
diff -r 1f5cb2534ee6 -r 44f9c43a4fe3 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
     Fri Jul 01 23:57:38 2011 +0200
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
     Sat Jul 02 16:29:42 2011 +0200
@@ -1204,11 +1204,40 @@
   // +++++++++++++++++++++++++++++ Record Selection Handling 
+++++++++++++++++++++++
   
   updateSelectedCountDisplay: function(){
-    var selection = this.getSelection();
+    var selection = this.getSelection(), fld, grid = this;
     var selectionLength = selection.getLength();
     var newValue = '&nbsp;';
     if (selectionLength > 0) {
       newValue = selectionLength;
+      
+      if (this.filterEditor && this.filterEditor.getEditForm()) {
+        fld = 
this.filterEditor.getEditForm().getField(this.getCheckboxField().name);
+        if (fld && !fld.clickForSelectedRow) {
+          fld.clickForSelectedRow = true;
+          fld.originalClick = fld.click;
+          fld.click = function() {
+            if (grid.getSelection().getLength() === 0) {
+              return;
+            }
+            grid.scrollToRow(grid.getRecordIndex(grid.getSelectedRecord()));
+            // do redraw as first columns with buttons are not drawn
+            grid.markForRedraw();
+          };
+          fld.itemHoverHTML = function() {
+            return OB.I18N.getLabel('OBUIAPP_ClickSelectedCount');
+          };
+        }
+        fld.textBoxStyle = 'OBGridFilterStaticTextClickable';
+        fld.updateState();
+      }
+    } else {
+      if (this.filterEditor && this.filterEditor.getEditForm()) {
+        fld = 
this.filterEditor.getEditForm().getField(this.getCheckboxField().name);
+        if (fld) {
+          fld.textBoxStyle = 'OBGridFilterStaticText';
+          fld.updateState();
+        }
+      }
     }
     if (this.filterEditor) {
       this.filterEditor.getEditForm().setValue(this.getCheckboxField().name, 
newValue);
diff -r 1f5cb2534ee6 -r 44f9c43a4fe3 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
 Fri Jul 01 23:57:38 2011 +0200
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
 Sat Jul 02 16:29:42 2011 +0200
@@ -899,8 +899,8 @@
     
     if (!record) { //  new case
       this.viewGrid.deselectAllRecords();
+      this.refreshChildViews();
       this.viewForm.editNewRecord(preventFocus);
-      this.refreshChildViews();
     } else {
       this.viewGrid.doSelectSingleRecord(record);
       
diff -r 1f5cb2534ee6 -r 44f9c43a4fe3 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
    Fri Jul 01 23:57:38 2011 +0200
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
    Sat Jul 02 16:29:42 2011 +0200
@@ -71,6 +71,7 @@
       if(!this.view.viewForm.validateForm()) {
         return;
       }
+      this.view.saveRow();
       this.view.switchFormGridVisibility();
       this.view.messageBar.hide();
     },
diff -r 1f5cb2534ee6 -r 44f9c43a4fe3 
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css
  Fri Jul 01 23:57:38 2011 +0200
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css
  Sat Jul 02 16:29:42 2011 +0200
@@ -47,6 +47,7 @@
 =======================================================================*/
 
 .OBFormField,
+.OBFormFieldClickable,
 .OBFormFieldDisabled,
 .OBFormFieldFocused,
 .OBFormFieldError {
diff -r 1f5cb2534ee6 -r 44f9c43a4fe3 
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-grid-styles.css
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-grid-styles.css
  Fri Jul 01 23:57:38 2011 +0200
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-grid-styles.css
  Sat Jul 02 16:29:42 2011 +0200
@@ -176,6 +176,7 @@
   border-top: 1px solid #b2b5b0;
 }
 
+.OBGridFilterStaticTextClickable
 .OBGridFilterStaticText {
   font-family: 'lucida sans', sans-serif;
   font-size: 11px;
@@ -184,6 +185,11 @@
   padding: 2px 0px 0px 0px;
 }
 
+.OBGridFilterStaticTextClickable {
+    background-color: #ffe1c0;
+    cursor: pointer;
+}
+
 .OBGridFilterFunnelBackground {
   background-color: #CDD7BB;
 }

------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security 
threats, fraudulent activity, and more. Splunk takes this data and makes 
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to