Merge pull request #940 from xtuple/tags/R1_4_5
authorTravis Webb <travis@traviswebb.com>
Sun, 13 Oct 2013 22:07:49 +0000 (15:07 -0700)
committerTravis Webb <travis@traviswebb.com>
Sun, 13 Oct 2013 22:07:49 +0000 (15:07 -0700)
v1.4.5 release

1  2 
lib/enyo-x/source/views/navigator.js

@@@ -457,12 -457,12 +457,12 @@@ trailing:true*
  
        // sending the locale information back over the wire saves a call to the db
        window.open(XT.getOrganizationPath() +
 -        '/%@?details={"nameSpace":"%@","type":"%@","query":%@,"locale":%@}'
 +        '/%@?details={"nameSpace":"%@","type":"%@","query":%@,"culture":%@}'
          .f(routeName,
            recordType.prefix(),
            recordType.suffix(),
            JSON.stringify(query),
 -          JSON.stringify(XT.session.locale.toJSON())),
 +          JSON.stringify(XT.locale.culture)),
          '_newtab');
      },
      showSortPopup: function (inSender, inEvent) {
      },
      showHelp: function () {
        var listName = this.$.contentPanels.getActive().name,
-         objectName = listName.indexOf("List") >= 0 ?
-           listName.substring(0, listName.length - 4) : // get rid of the word "list"
-           listName.substring(0, listName.length - 1), // get rid of the trailing 's'. Devs shouldn't be using this naming convention.
+         // this will work fine starting in 1.4.6:
+         //culture = XT.locale.culture,
+         culture = XT.locale.culture || XT.session.locale.attributes.culture,
+         objectName = (listName.indexOf("List") >= 0 || listName.indexOf("Page") >= 0) ?
+           listName.substring(0, listName.length - 4) : // get rid of the word "List" or "Page"
+           listName,
          pageName = objectName.decamelize().replace(/_/g, "-"),
-         url = XT.HELP_URL_ROOT + pageName,
+         url = XT.HELP_URL_ROOT + pageName + "?culture=" + culture,
          panel = {name: 'help', show: true, url: url};
  
        this.doNavigatorEvent(panel);