Merge pull request #1011 from shackbarth/21821

issue #21821: give mobile its own welcome screen metric

diff --git a/enyo-client/application/source/views/module_container.js b/enyo-client/application/source/views/module_container.js
index 41b2e7a..032185b 100644 (file)
--- a/enyo-client/application/source/views/module_container.js
+++ b/enyo-client/application/source/views/module_container.js
@@ -25,7 +25,7 @@ trailing:true, white:true*/
       // Look for welcome page and set to what settings say to
       var children = this.$.navigator.$.contentPanels.children,
         welcome = _.findWhere(children, {name: "welcomePage"}),
-        url = XT.session.settings.get("WelcomePage");
+        url = XT.session.settings.get("MobileWelcomePage");
       if (welcome && url) {
         welcome.setAttributes({src: url});
       }

diff --git a/enyo-client/database/source/public/tables/metric.sql b/enyo-client/database/source/public/tables/metric.sql
index 4f2288d..a90f7ae 100644 (file)
--- a/enyo-client/database/source/public/tables/metric.sql
+++ b/enyo-client/database/source/public/tables/metric.sql
@@ -1,4 +1,4 @@
 -- Add default welcome page path
 insert into metric (metric_name, metric_value)
-select 'WelcomePage', 'https://www.xtuple.com/welcome'
-where not exists (select c.metric_id from metric c where c.metric_name = 'WelcomePage');
+select 'MobileWelcomePage', 'https://www.xtuple.com/welcome'
+where not exists (select c.metric_id from metric c where c.metric_name = 'MobileWelcomePage');

diff --git a/enyo-client/database/source/xm/javascript/database_information.sql b/enyo-client/database/source/xm/javascript/database_information.sql
index 4263fe8..a414e2c 100644 (file)
--- a/enyo-client/database/source/xm/javascript/database_information.sql
+++ b/enyo-client/database/source/xm/javascript/database_information.sql
@@ -10,7 +10,7 @@ select xt.install_js('XM','DatabaseInformation','xtuple', $$
     "DatabaseName",
     "DatabaseComments",
     "ServerVersion",
-    "WelcomePage"
+    "MobileWelcomePage"
   ]
 
   /*