Permalink
Browse files

Fix merge conflict.

  • Loading branch information...
2 parents 7c7abdd + 395eb28 commit 4d8207a925d4d96eb55e68c613be657902679c2c @bendiy bendiy committed Mar 7, 2013
Showing with 12,221 additions and 3,156 deletions.
  1. +4 −30 README.md
  2. +42 −1 enyo-client/application/source/en/strings.js
  3. +45 −3 enyo-client/application/source/ext/core.js
  4. +7 −2 enyo-client/application/source/ext/datasource.js
  5. +1 −1 enyo-client/application/source/models/address.js
  6. +94 −5 enyo-client/application/source/models/currency.js
  7. +156 −45 enyo-client/application/source/models/customer.js
  8. +2 −5 enyo-client/application/source/models/incident.js
  9. +80 −4 enyo-client/application/source/models/item.js
  10. +94 −5 enyo-client/application/source/models/item_site.js
  11. +2 −4 enyo-client/application/source/models/opportunity.js
  12. +1 −0 enyo-client/application/source/models/package.js
  13. +1,180 −56 enyo-client/application/source/models/quote.js
  14. +39 −0 enyo-client/application/source/models/sale_type.js
  15. +32 −4 enyo-client/application/source/models/site.js
  16. +51 −13 enyo-client/application/source/models/tax.js
  17. +2 −3 enyo-client/application/source/models/to_do.js
  18. +2 −4 enyo-client/application/source/models/user_account.js
  19. +84 −16 enyo-client/application/source/startup.js
  20. +22 −10 enyo-client/application/source/views/comment_box.js
  21. +6 −0 enyo-client/application/source/views/documents_box.js
  22. +72 −2 enyo-client/application/source/views/list.js
  23. +60 −0 enyo-client/application/source/views/list_relations.js
  24. +107 −4 enyo-client/application/source/views/list_relations_editor_box.js
  25. +155 −9 enyo-client/application/source/views/workspace.js
  26. +84 −59 enyo-client/application/source/widgets/number.js
  27. +57 −2 enyo-client/application/source/widgets/parameter.js
  28. +55 −16 enyo-client/application/source/widgets/picker.js
  29. +14 −130 enyo-client/application/source/widgets/relation.js
  30. +31 −3 enyo-client/database/orm/models/customer.json
  31. +110 −5 enyo-client/database/orm/models/item.json
  32. +360 −174 enyo-client/database/orm/models/quote.json
  33. +51 −0 enyo-client/database/orm/models/sale_type.json
  34. +1 −1 enyo-client/database/orm/models/sales_rep.json
  35. +110 −21 enyo-client/database/orm/models/tax.json
  36. +1 −5 enyo-client/database/source/delete_system_orms.sql
  37. +22 −6 enyo-client/database/source/init_instance.sql
  38. +64 −0 enyo-client/database/source/xm/javascript/customer.sql
  39. +95 −0 enyo-client/database/source/xm/javascript/item.sql
  40. +116 −0 enyo-client/database/source/xm/javascript/quote.sql
  41. +123 −0 enyo-client/database/source/xm/javascript/sales.sql
  42. +1 −1 enyo-client/database/source/xt/functions/add_priv.sql
  43. +7 −0 enyo-client/database/source/xt/functions/quote_freight_weight.sql
  44. +3 −0 enyo-client/database/source/xt/functions/quote_line_customer_discount.sql
  45. +3 −0 enyo-client/database/source/xt/functions/quote_line_extended_price.sql
  46. +10 −0 enyo-client/database/source/xt/functions/quote_line_list_cost_markup.sql
  47. +5 −0 enyo-client/database/source/xt/functions/quote_line_list_price.sql
  48. +3 −0 enyo-client/database/source/xt/functions/quote_line_list_price_discount.sql
  49. +3 −0 enyo-client/database/source/xt/functions/quote_line_profit.sql
  50. +12 −0 enyo-client/database/source/xt/functions/quote_line_tax.sql
  51. +3 −0 enyo-client/database/source/xt/functions/quote_margin.sql
  52. +3 −0 enyo-client/database/source/xt/functions/quote_schedule_date.sql
  53. +5 −0 enyo-client/database/source/xt/functions/quote_subtotal.sql
  54. +10 −0 enyo-client/database/source/xt/functions/quote_tax_total.sql
  55. +3 −0 enyo-client/database/source/xt/functions/quote_total.sql
  56. +5 −0 enyo-client/database/source/xt/functions/quote_total_cost.sql
  57. +222 −19 enyo-client/database/source/xt/views/quheadinfo.sql
  58. +108 −0 enyo-client/database/source/xt/views/quiteminfo.sql
  59. +5 −0 enyo-client/extensions/source/admin/client/en/strings.js
  60. +32 −63 enyo-client/extensions/source/admin/client/models/models.js
  61. +70 −2 enyo-client/extensions/source/admin/client/views/workspace.js
  62. +1 −10 enyo-client/extensions/source/crm/database/orm/ext/quote.json
  63. +2 −1 enyo-client/extensions/source/sales/client/models/package.js
  64. +26 −0 enyo-client/extensions/source/sales/client/models/startup.js
  65. +2 −1 enyo-client/extensions/source/sales/client/postbooks.js
  66. +1 −1 enyo-client/extensions/source/sales/database/orm/ext/quote.json
  67. +4,276 −0 enyo-client/extensions/tools/build/enyo.js
  68. +1 −1 lib/backbone-x/source/alarm.js
  69. +1 −2 lib/backbone-x/source/collection.js
  70. +2 −2 lib/backbone-x/source/document.js
  71. +74 −21 lib/backbone-x/source/model.js
  72. +2 −0 lib/enyo-x/source/en/strings.js
  73. +181 −172 lib/enyo-x/source/less/screen.less
  74. +18 −10 lib/enyo-x/source/stylesheets/screen.css
  75. +1 −0 lib/enyo-x/source/views/assignment_box.js
  76. +240 −0 lib/enyo-x/source/views/child_workspace.js
  77. +11 −4 lib/enyo-x/source/views/list_relations.js
  78. +9 −7 lib/enyo-x/source/views/list_relations_editor_box.js
  79. +17 −3 lib/enyo-x/source/views/module_container.js
  80. +1 −0 lib/enyo-x/source/views/package.js
  81. +64 −30 lib/enyo-x/source/views/workspace.js
  82. +68 −13 lib/enyo-x/source/widgets/address.js
  83. +63 −20 lib/enyo-x/source/widgets/relation.js
  84. +0 −24 lib/orm/installer/README
  85. +0 −31 lib/orm/installer/installer.js
  86. +0 −377 lib/orm/installer/orm.js
  87. +2 −0 lib/orm/source/xt/functions/add_column.sql
  88. +2 −2 lib/orm/source/xt/javascript/orm.sql
  89. +3 −0 lib/tools/source/en/strings.js
  90. +9 −0 lib/tools/source/error.js
  91. +21 −5 lib/tools/source/math.js
  92. +1 −1 lib/tools/source/request.js
  93. +1 −1 node-datasource/installer/orm.js
  94. +1 −1 node-datasource/routes/auth.js
  95. +8 −1 node-datasource/routes/data.js
  96. +18 −7 node-datasource/routes/maintenance.js
  97. +1 −1 node-datasource/routes/report.js
  98. +10 −2 node-datasource/routes/syncUser.js
  99. 0 node-datasource/runMaintenance.js
  100. +1 −0 node-datasource/sample_config.js
  101. +63 −2 node-datasource/scripts/initInstanceDb.sh
  102. +1 −11 node-datasource/test/selenium/README.md
  103. +22 −0 node-datasource/test/selenium/environments.js
  104. +95 −92 node-datasource/test/selenium/lib/contactObj.js
  105. +15 −13 node-datasource/test/selenium/lib/createContactForAndroid.js
  106. +13 −10 node-datasource/test/selenium/lib/createContactForFFnC.js
  107. +17 −15 node-datasource/test/selenium/lib/createContactForFFonWin8.js
  108. +15 −13 node-datasource/test/selenium/lib/createContactForIphone.js
  109. +46 −0 node-datasource/test/selenium/lib/deleteContactForAndroid.js
  110. +36 −33 node-datasource/test/selenium/lib/login.js
  111. +5 −5 node-datasource/test/selenium/lib/loginObj.js
  112. +17 −56 node-datasource/test/selenium/lib/readContactForAndroid.js
  113. +18 −40 node-datasource/test/selenium/lib/readContactForFFnC.js
  114. +20 −43 node-datasource/test/selenium/lib/readContactForFFonWin8.js
  115. +27 −50 node-datasource/test/selenium/lib/readContactForIphone.js
  116. +7 −1 node-datasource/test/selenium/lib/utils.js
  117. +3 −2 node-datasource/test/selenium/package.json
  118. +120 −0 node-datasource/test/selenium/runtests.js
  119. +0 −112 node-datasource/test/selenium/sauce-arguments.js
  120. +0 −116 node-datasource/test/selenium/seleniumtest.js
  121. +6 −0 node-datasource/test/vows/README.md
  122. +35 −0 node-datasource/test/vows/kinds/picker_filter_test.js
  123. +130 −127 node-datasource/test/vows/lib/crud.js
  124. +8 −3 node-datasource/test/vows/lib/zombie_auth.js
  125. +83 −0 node-datasource/test/vows/models/country.js
  126. +99 −0 node-datasource/test/vows/models/customer.js
  127. +0 −52 node-datasource/test/vows/models/customer_test.js
  128. +81 −0 node-datasource/test/vows/models/honorific.js
  129. +0 −44 node-datasource/test/vows/models/honorific_test.js
  130. +78 −64 node-datasource/test/vows/{wip → models}/project.js
  131. +86 −0 node-datasource/test/vows/models/sale_type.js
  132. +85 −0 node-datasource/test/vows/models/ship_via.js
  133. +85 −0 node-datasource/test/vows/models/ship_zone.js
  134. +83 −0 node-datasource/test/vows/models/state.js
  135. +43 −234 node-datasource/test/vows/wip/address.js
  136. 0 node-datasource/test/vows/{models/contact_test.js → wip/contact.js}
  137. +46 −97 node-datasource/test/vows/wip/country.js
  138. +0 −81 node-datasource/test/vows/wip/customer.js
  139. +0 −102 node-datasource/test/vows/wip/date_test.js
  140. 0 node-datasource/test/vows/{models/quote_test.js → wip/quote.js}
  141. +65 −0 node-datasource/test/vows/wip/sale_type.js
  142. +0 −71 node-datasource/test/vows/wip/shipvia.js
  143. +48 −34 node-datasource/test/vows/wip/shipzone.js
  144. +48 −99 node-datasource/test/vows/wip/state.js
  145. BIN pentaho/prpt/Account.prpt
  146. BIN pentaho/prpt/AccountList.prpt
  147. BIN pentaho/prpt/Contact.prpt
  148. BIN pentaho/prpt/ContactList.prpt
  149. BIN pentaho/prpt/ContactListStacked.prpt
  150. BIN pentaho/prpt/CustomerList.prpt
  151. BIN pentaho/prpt/CustomerListNew.prpt
  152. BIN pentaho/prpt/IncidentList.prpt
  153. BIN pentaho/prpt/OpportunityList.prpt
  154. BIN pentaho/prpt/OpportunityListNew.prpt
  155. BIN pentaho/prpt/ProspectListNew.prpt
  156. BIN pentaho/prpt/Quote.prpt
  157. BIN pentaho/prpt/QuoteTest.prpt
  158. BIN pentaho/prpt/ToDoList.prpt
  159. BIN pentaho/prpt/ToDoNew.prpt
  160. BIN pentaho/prpt/temp.prpt
  161. +48 −0 pentaho/readme.md
  162. +497 −0 pentaho/resources/strings.properties
  163. +497 −0 pentaho/resources/strings_en_US.properties
  164. +3 −0 pentaho/resources/xTupleConfig.properties
  165. +6 −0 pentaho/scripts/build-scripts.bat
  166. BIN pentaho/scripts/com/xTuple/PropertyBundle.class
  167. +16 −0 pentaho/scripts/com/xTuple/PropertyBundle.groovy
  168. BIN pentaho/scripts/com/xTuple/TableModelReflect$_getModel_closure2.class
  169. BIN pentaho/scripts/com/xTuple/TableModelReflect$_getModel_closure3.class
  170. BIN pentaho/scripts/com/xTuple/TableModelReflect$_getModel_closure4.class
  171. BIN pentaho/scripts/com/xTuple/TableModelReflect$_getModel_closure5.class
  172. BIN pentaho/scripts/com/xTuple/TableModelReflect$_jsonProp_closure1.class
  173. BIN pentaho/scripts/com/xTuple/TableModelReflect$_jsonProp_closure1_closure6.class
  174. BIN pentaho/scripts/com/xTuple/TableModelReflect.class
  175. +219 −0 pentaho/scripts/com/xTuple/TableModelReflect.groovy
  176. BIN pentaho/scripts/lib/commons-beanutils-1.8.0-BETA.jar
  177. BIN pentaho/scripts/lib/commons-collections-3.2.jar
  178. BIN pentaho/scripts/lib/commons-lang-2.6.jar
  179. BIN pentaho/scripts/lib/commons-logging-1.1.jar
  180. BIN pentaho/scripts/lib/ezmorph-1.0.6.jar
  181. BIN pentaho/scripts/lib/groovy-all-1.8.0.jar
  182. BIN pentaho/scripts/lib/json-lib-2.4-jdk15.jar
  183. BIN pentaho/scripts/lib/pentaho-reporting-engine-classic-core-3.9.1-GA.jar
  184. BIN pentaho/scripts/xTupleScripts.jar
  185. +0 −50 update.sh
View
@@ -1,34 +1,8 @@
-xtuple
+xTuple
======
-xTuple Enterprise Resource Planning
+xTuple Enterprise Resource Planning Mobile-Web client
-To migrate to this new repo:
-fork github.com/xtuple/xtuple.git
+For a full description of how to install this project, please visit:
- cd /path/to/git/home
- git clone https://github.com/yourgithubname/xtuple.git
- cd xtuple
- git submodule update --init --recursive
- cd node-datasource
- npm install
- cd node_modules/express
- npm install
- cd ../../xt
- npm install
- cd ..
-
-copy over old datasource stuff if you have it
-
- cp ../../node-datasource/config.js .
- cp ../../node-datasource/lib/private/* lib/private/
-
-build the extensions
-
- cd ../enyo-client/extensions
- ./tools/buildExtensions.sh
-
-start the datasource
-
- cd ../../node-datasource
- sudo ./main.js
+http://www.xtuple.org/developer-zone/mobile-web/setup-environment
@@ -60,6 +60,7 @@ var lang = XT.stringsFor("en_US", {
"_address": "Address",
"_address1": "Address1",
"_address2": "Address2",
+ "_address3": "Address3",
"_addressCharacteristic": "Address Characteristic",
"_addressComment": "Address Comment",
"_addresses": "Addresses",
@@ -81,6 +82,7 @@ var lang = XT.stringsFor("en_US", {
"_balanceMethod": "Balance Method",
"_bcc": "Bcc",
"_billingContact": "Billing Contact",
+ "_billTo": "Bill To",
"_blanketPurchaseOrders": "Uses Blanket Purchase Orders",
"_body": "Body",
"_boolean": "Boolean",
@@ -109,6 +111,7 @@ var lang = XT.stringsFor("en_US", {
"_contact": "Contact",
"_contactRelations": "Contacts",
"_contacts": "Contacts",
+ "_copyToShipTo": "Copy to Ship To",
"_county": "County",
"_correspondenceContact": "Correspondence Contact",
"_countries": "Countries",
@@ -127,8 +130,12 @@ var lang = XT.stringsFor("en_US", {
"_currencyName": "Currency Name",
"_currencyNumber": "Currency Number",
"_currencySymbol": "Currency Symbol",
+ "_custPO": "Customer PO",
+ "_customerPartNumber": "Customer P/N",
+ "_custPrice": "Cust. Price",
"_customer": "Customer",
"_customerType": "Customer Type",
+ "_customerPrice": "Customer Price",
"_customers": "Customers",
"_customerProspect": "Customer / Prospect",
"_customerOrProspect": "Would you like to create a new Customer or a new Prospect?",
@@ -172,6 +179,7 @@ var lang = XT.stringsFor("en_US", {
"_expiredColor": "Expired Color",
"_expires": "Expires",
"_extended": "Extended",
+ "_extendedPrice": "Extended Price",
"_extendedDescription": "Extended Description",
"_extendedPriceScale": "Extended Price Scale",
"_externalReference": "External Reference",
@@ -182,11 +190,14 @@ var lang = XT.stringsFor("en_US", {
"_filterBy": "Filter By",
"_firstName": "First Name",
"_flag": "Flag",
+ "_fob": "F.O.B.",
"_for": "For",
"_fractional": "Fractional",
"_frequency": "Frequency",
"_freeFormBill": "Allow Free-Form Bill-To",
"_freeFormShip": "Allow Free-Form Ship-Tos",
+ "_freight": "Freight",
+ "_freightWeight": "Freight Weight",
"_from": "From",
"_fromDate": "From Date",
"_futureColor": "Future Color",
@@ -257,15 +268,20 @@ var lang = XT.stringsFor("en_US", {
"_line1": "Line1",
"_line2": "Line2",
"_line3": "Line3",
+ "_lineItems": "Line Items",
"_lineNumber": "Line Number",
"_lines": "Lines",
"_list" : "List",
+ "_listCost" : "List Cost",
+ "_listCostMarkup" : "List Cost Markup",
"_listPrice": "List Price",
+ "_listPriceDiscount": "List Price Discount",
"_locale": "Locale",
"_login": "Login",
"_logout": "Logout",
"_lotSerial": "Lot/Serial",
"_mainAddress": "Main Address",
+ "_margin": "Margin",
"_mask": "Mask",
"_match": "Match",
"_maximum": "Maximum",
@@ -301,8 +317,10 @@ var lang = XT.stringsFor("en_US", {
"_order": "Order",
"_orderDate": "Order Date",
"_orderNumber": "Order Number",
+ "_orderNotes": "Order Notes",
"_ordered": "Ordered",
"_owner": "Owner",
+ "_packDate": "Pack Date",
"_paid": "Paid",
"_partialShip": "Accepts Partial Shipments",
"_partner": "Partner",
@@ -316,7 +334,8 @@ var lang = XT.stringsFor("en_US", {
"_policy": "Policy",
"_postbooks": "PostBooks",
"_price": "Price",
- "_priceUnit": "Price Unit",
+ "_priceMode": "Price Mode",
+ "_priceUnit": "Price UOM",
"_priceUnitRatio": "Price Unit Ratio",
"_primaryContact": "Primary Contact",
"_primaryEmail": "Primary Email",
@@ -328,7 +347,9 @@ var lang = XT.stringsFor("en_US", {
"_probability": "Probability",
"_productCategories": "Product Categories",
"_productCategory": "Product Category",
+ "_product": "Product",
"_products": "Products",
+ "_profit": "Profit",
"_project": "Project",
"_projectAssignedTo": "Project Assigned To",
"_projectOwner": "Project Owner",
@@ -338,6 +359,7 @@ var lang = XT.stringsFor("en_US", {
"_projectTasks": "Project Tasks",
"_projectTaskStatus": "Project Task Status",
"_projects": "Projects",
+ "_promiseDate": "Promised Date",
"_properName": "Proper Name",
"_propername": "Propername",
"_prospect": "Prospect",
@@ -347,6 +369,12 @@ var lang = XT.stringsFor("en_US", {
"_required": "Required",
"_qualifier": "Qualifier",
"_quantity": "Quantity",
+ "_quantityOrd": "Qty Ordered",
+ "_quantityUnit": "Qty UOM",
+ "_quantityUnitRatio": "Qty Unit Ratio",
+ "_quantityShip": "Qty Shipped",
+ "_quote": "Quote",
+ "_quoteLine": "Quote Line",
"_quotes": "Quotes",
"_recurrences": "Recurrences",
"_recurring": "Recurring",
@@ -356,7 +384,9 @@ var lang = XT.stringsFor("en_US", {
"_resolution": "Resolution",
"_roles": "Roles",
"_salesRep": "Sales Rep",
+ "_saleType": "Sale Type",
"_schedule": "Schedule",
+ "_scheduleDate": "Scheduled Date",
"_secondaryContact": "Secondary Contact",
"_selectOrganization": "Select Organization",
"_sense": "Sense",
@@ -365,11 +395,14 @@ var lang = XT.stringsFor("en_US", {
"_settings": "Settings",
"_setup": "Setup",
"_severity": "Severity",
+ "_shipping": "Shipping",
"_shipCharge": "Shipping Charges",
"_shipForm": "Shipping Form",
"_shipVia": "Ship Via",
"_shipTo": "Ship To",
"_shipZone": "Ship Zone",
+ "_shippingNotes": "Shipping Notes",
+ "_site": "Site",
"_showCompleted": "Show Complete",
"_showCompletedOnly": "Show Complete Only",
"_showInactive": "Show Inactive",
@@ -383,6 +416,7 @@ var lang = XT.stringsFor("en_US", {
"_status": "Status",
"_string": "String",
"_subject": "Subject",
+ "_subtotal": "Subtotal",
"_suffix": "Suffix",
"_summary": "Summary",
"_symbol": "Symbol",
@@ -392,6 +426,7 @@ var lang = XT.stringsFor("en_US", {
"_targetType": "Target Type",
"_tasks": "Tasks",
"_tax": "Tax",
+ "_taxType": "Tax Type",
"_taxAuthority": "Tax Authority",
"_taxRegistration": "Tax Registration Numbers",
"_taxZone": "Tax Zone",
@@ -410,9 +445,11 @@ var lang = XT.stringsFor("en_US", {
"_trigger": "Trigger",
"_type": "Type",
"_unit": "Unit",
+ "_unitPrice": "Net Unit Price",
"_units": "Units",
"_unitType": "Unit Type",
"_unknown": "(unknown)",
+ "_uom": "UOM",
"_updated": "Updated",
"_updatedBy": "Updated By",
"_url": "Link",
@@ -449,9 +486,11 @@ var lang = XT.stringsFor("en_US", {
"_noNumber": "No Number",
"_noPhone": "No Phone",
"_noPriority": "No Priority",
+ "_noPurchaseOrder": "No Purchase Order Number",
"_noSalesRep": "No Sales Rep",
"_noSeverity": "No Severity",
"_noStage": "No Stage",
+ "_noStatus": "No Status",
"_noTerms": "No Terms",
"_noType": "No Type",
@@ -542,6 +581,8 @@ var lang = XT.stringsFor("en_US", {
"_lengthInvalid": "Length of {attr} must be {length}.",
"_mustSave": "You must save your changes before proceeding.",
"_nameRequired": "A name is required.",
+ "_noPriceFound": "This item is marked as exclusive and no qualifying price was found.",
+ "_noPurchase": "This item may not be purchased in this date. Please select another date or item.",
"_productCategoryRequiredOnSold": "A Product Category is required for sold items.",
"_recursiveParentDisallowed": "Record is not allowed to reference itself as the parent.",
"_recordNotFound": "Record not found.",
@@ -76,10 +76,10 @@ white:true*/
@static
@constant
@type Number
- @default 0
+ @default 2
*/
- EXTENDED_PRICE_SCALE: 4,
-
+ EXTENDED_PRICE_SCALE: 2,
+
/**
System precision scale for unit conversion ratios.
@@ -190,7 +190,49 @@ white:true*/
*/
getHistory: function () {
return this.history;
+ },
+
+ toMoney: function (value) {
+ return XT.math.round(value, XT.MONEY_SCALE);
+ },
+
+ toQuantity: function (value) {
+ return XT.math.round(value, XT.QTY_SCALE);
+ },
+
+ toQuantityPer: function (value) {
+ return XT.math.round(value, XT.QTY_PER_SCALE);
+ },
+
+ toCost: function (value) {
+ return XT.math.round(value, XT.COST_SCALE);
+ },
+
+ toSalesPrice: function (value) {
+ return XT.math.round(value, XT.SALES_PRICE_SCALE);
+ },
+
+ toPurchasePrice: function (value) {
+ return XT.math.round(value, XT.PURCHASE_PRICE_SCALE);
+ },
+
+ toExtendedPrice: function (value) {
+ return XT.math.round(value, XT.EXTENDED_PRICE_SCALE);
+ },
+
+ toUnitRatio: function (value) {
+ return XT.math.round(value, XT.UNIT_RATIO_SCALE);
+ },
+
+ toPercent: function (value) {
+ // Models store percent as decimal, so add two
+ return XT.math.round(value, XT.PERCENT_SCALE + 2);
+ },
+
+ toWeight: function (value) {
+ return XT.math.round(value, XT.WEIGHT_SCALE);
}
+
});
}());
@@ -243,15 +243,20 @@ white:true*/
*/
resetPassword: function (id, options) {
var payload = {
- id: id,
- newUser: options.newUser
+ id: id
},
ajax = new enyo.Ajax({
url: "/resetPassword",
success: options ? options.success : undefined,
error: options ? options.error : undefined
});
+ if (options.newUser) {
+ // we don't want to send false at all, because false turns
+ // into "false" over the wire which is truthy.
+ payload.newUser = options.newUser;
+ }
+
ajax.response(this.ajaxSuccess);
ajax.go(payload);
},
@@ -186,7 +186,7 @@ white:true*/
findExistingOptions.success = function (resp) {
// If found, set the address with found id
if (resp) {
- address.set('id', resp, {force: true}); // Id is all that matters...
+ address.set('id', resp); // Id is all that matters...
address.status = K.READY_CLEAN; // So we don't come back here
}
Oops, something went wrong.

0 comments on commit 4d8207a

Please sign in to comment.