Merge branch 'release-10.1.2' into stable

pixl8 · Jul 2, 2015 · bc90ad9 · bc90ad9
2 parents 568b610 + 04bf7d8
commit bc90ad9
Show file tree

Hide file tree

Showing 93 changed files with 5,084 additions and 285 deletions.
diff --git a/support/build/build.properties b/support/build/build.properties
@@ -17,5 +17,5 @@ build.number.remote.url=http://downloads.presidecms.com/presidecms/build.number
 
 ##############################
 # MANUALLY UPDATE EACH VERSION
-preside.version=10.1.1
+preside.version=10.2.0
 ##############################
diff --git a/support/docs/source/devguides/websiteusers.rst b/support/docs/source/devguides/websiteusers.rst
@@ -158,7 +158,12 @@ For example:
         // ... etc.
     }
 
+Login impersonation
+-------------------
 
+CMS administrative users, with sufficient privileges, are able to "impersonate" the login of website users through the admin GUI. Once they have done this, they are treated as a fully logged in user in the front end.
+
+If you wish to restrict these impersonated logins in any way, you can use the :code:`isImpersonated()` method of the :doc:`/reference/api/websiteloginservice` object to check to see whether or not the current login is merely an impersonated one.
 
 Permissions
 ###########

diff --git a/support/docs/source/reference/api/presideobjectservice.rst b/support/docs/source/reference/api/presideobjectservice.rst
@@ -169,7 +169,7 @@ UpdateData()
 
 .. code-block:: java
 
-    public numeric function updateData( required string objectName, required struct data, string id="", any filter, struct filterParams, array extraFilters, array savedFilters, boolean forceUpdateAll=false, boolean updateManyToManyRecords=false, boolean useVersioning=auto, numeric versionNumber=0 )
+    public numeric function updateData( required string objectName, required struct data, string id="", any filter, struct filterParams, array extraFilters, array savedFilters, boolean forceUpdateAll=false, boolean updateManyToManyRecords=false, boolean useVersioning=auto, numeric versionNumber=0, boolean forceVersionCreation=false )
 
 Updates records in the database with a new set of data. Returns the number of records affected by the operation.
 
@@ -191,6 +191,7 @@ forceUpdateAll           boolean  No (default=false)  If no ID and no filters ar
 updateManyToManyRecords  boolean  No (default=false)  Whether or not to update multiple relationship records for properties that have a many-to-many relationship                                
 useVersioning            boolean  No (default=auto)   Whether or not to use the versioning system with the update. If the object is setup to use versioning (default), this will default to true.
 versionNumber            numeric  No (default=0)      If using versioning, specify a version number to save against (if none specified, one will be created automatically)                       
+forceVersionCreation     boolean  No (default=false)                                                                                                                                             
 =======================  =======  ==================  ===========================================================================================================================================
 
 
@@ -418,7 +419,7 @@ GetDeNormalizedManyToManyData()
 
 .. code-block:: java
 
-    public struct function getDeNormalizedManyToManyData( required string objectName, required string id, boolean fromVersionTable=false, string maxVersion="HEAD", numeric specificVersion=0 )
+    public struct function getDeNormalizedManyToManyData( required string objectName, required string id, boolean fromVersionTable=false, string maxVersion="HEAD", numeric specificVersion=0, array selectFields )
 
 Returns a structure of many to many data for a given record. Each structure key represents a many-to-many type property on the object. The value for each key will be a comma separated list of IDs of the related data.
 
@@ -434,6 +435,7 @@ id                string   Yes                  ID of the record who's related d
 fromVersionTable  boolean  No (default=false)   Whether or not to retrieve the data from the version history table for the object
 maxVersion        string   No (default="HEAD")  If retrieving from the version history, set a max version number                 
 specificVersion   numeric  No (default=0)       If retrieving from the version history, set a specific version number to retrieve
+selectFields      array    No                                                                                                    
 ================  =======  ===================  =================================================================================
 
 
@@ -562,6 +564,27 @@ objectName  string  Yes       Name of the object that you wish to check the exis
 ==========  ======  ========  ==========================================================
 
 
+.. _presideobjectservice-objectisautogenerated:
+
+ObjectIsAutoGenerated()
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: java
+
+    public boolean function objectIsAutoGenerated( required string objectName )
+
+Returns whether or not the object has been automatically created by the system
+
+Arguments
+.........
+
+==========  ======  ========  =========================================
+Name        Type    Required  Description                              
+==========  ======  ========  =========================================
+objectName  string  Yes       Name of the object that you wish to check
+==========  ======  ========  =========================================
+
+
 .. _presideobjectservice-fieldexists:
 
 FieldExists()

diff --git a/support/docs/source/reference/api/websiteloginservice.rst b/support/docs/source/reference/api/websiteloginservice.rst
@@ -122,6 +122,24 @@ Arguments
 
 *This method does not accept any arguments.*
 
+.. _websiteloginservice-isimpersonated:
+
+IsImpersonated()
+~~~~~~~~~~~~~~~~
+
+.. code-block:: java
+
+    public boolean function isImpersonated( )
+
+Returns whether or not the user making the current request is only "impersonated" by an admin user.
+This method can then be used to hide sensitive information that even admin users impersonating a web
+user should not be able to see.
+
+Arguments
+.........
+
+*This method does not accept any arguments.*
+
 .. _websiteloginservice-getloggedinuserdetails:
 
 GetLoggedInUserDetails()

diff --git a/support/docs/source/reference/presideobjects/asset.rst b/support/docs/source/reference/presideobjects/asset.rst
@@ -29,9 +29,10 @@ Properties
     property name="description"       type="string"  dbtype="text"    maxLength=0       required=false;
     property name="author"            type="string"  dbtype="varchar" maxLength=100     required=false;
     property name="size"              type="numeric" dbtype="int"                       required=true;
-    property name="asset_type"        type="string" dbtype="varchar" maxLength=10       required=true;
-    property name="raw_text_content"  type="string" dbtype="longtext";
-
+    property name="asset_type"        type="string"  dbtype="varchar" maxLength=10      required=true;
+    property name="raw_text_content"  type="string"  dbtype="longtext";
+    property name="width"             type="numeric" dbtype="int"                       required=false;
+    property name="height"            type="numeric" dbtype="int"                       required=false;
     property name="active_version"    relationship="many-to-one" relatedTo="asset_version" required=false;
 
     property name="access_restriction"  type="string"  dbtype="varchar" maxLength="7" required=false default="inherit" format="regex:(inherit|none|full)"  control="select" values="inherit,none,full" labels="preside-objects.asset:access_restriction.option.inherit,preside-objects.asset:access_restriction.option.none,preside-objects.asset:access_restriction.option.full";

diff --git a/support/docs/source/reference/presideobjects/website_benefit.rst b/support/docs/source/reference/presideobjects/website_benefit.rst
@@ -29,6 +29,8 @@ Properties
     property name="priority"    type="numeric" dbtype="int"                      required=false default="method:calculatePriority";
     property name="description" type="string"  dbtype="varchar" maxLength="200"  required=false;
 
+    property name="combined_benefits" relationship="many-to-many" relatedTo="website_benefit" relatedVia="website_benefit_combined_benefits";
+
 
 Public API Methods
 ------------------
diff --git a/support/docs/source/reference/systemforms/assetaddform.rst b/support/docs/source/reference/systemforms/assetaddform.rst
@@ -11,7 +11,7 @@ For multi file uploads, this form will be rendered once for each file.
     <?xml version="1.0" encoding="UTF-8"?>
 
     <form>
-        <tab id="standard" sortorder="10">
+        <tab id="standard" sortorder="10" title="preside-objects.asset:standard.tab.title">
             <fieldset id="standard" sortorder="10">
                 <field sortorder="10" binding="asset.title" />
                 <field sortorder="20" binding="asset.author" control="textinput" />

diff --git a/support/docs/source/reference/systemforms/systemconfigformwebsiteusers.rst b/support/docs/source/reference/systemforms/systemconfigformwebsiteusers.rst
@@ -14,7 +14,7 @@ This form is used to configure the core website users system.
             <fieldset id="default" sortorder="10">
                 <field sortorder="10" name="allow_remember_me"           control="yesNoSwitch"        required="false" default="true" label="system-config.website_users:allow_remember_me.label"           help="system-config.website_users:allow_remember_me.help"           />
                 <field sortorder="20" name="remember_me_expiry"          control="spinner"            required="false" default="90"   label="system-config.website_users:remember_me_expiry.label"          help="system-config.website_users:remember_me_expiry.help"          />
-                <field sortorder="30" name="reset_password_token_expiry" control="spinner"            required="false" default="60"   label="system-config.website_users:reset_password_token_expiry.label" help="system-config.website_users:reset_password_token_expiry.help" />
+                <field sortorder="30" name="reset_password_token_expiry" control="spinner"            required="false" default="60"   label="system-config.website_users:reset_password_token_expiry.label" help="system-config.website_users:reset_password_token_expiry.help" maxValue="999999"/>
                 <field sortorder="40" name="default_post_login_page"     control="siteTreePagePicker" required="false"                label="system-config.website_users:default_post_login_page.label"     help="system-config.website_users:default_post_login_page.help"     />
                 <field sortorder="50" name="default_post_logout_page"    control="siteTreePagePicker" required="false"                label="system-config.website_users:default_post_logout_page.label"    help="system-config.website_users:default_post_logout_page.help"    />
             </fieldset>

diff --git a/support/docs/source/reference/systemforms/updatemanagersettingsform.rst b/support/docs/source/reference/systemforms/updatemanagersettingsform.rst
@@ -12,7 +12,7 @@ This form is used for updating general settings of the Update manager. i.e. Whic
     <form>
         <tab id="administrator" sortorder="10">
             <fieldset id="administrator" sortorder="10">
-                <field  sortorder="10" name="branch"           control="select"   required="true"  label="cms:updateManager.branch.field.label"         values="release,stable,bleedingEdge" labels="cms:updateManager.branch.release,cms:updateManager.branch.stable,cms:updateManager.branch.bleedingEdge" />
+                <field  sortorder="10" name="branch"           control="select"   required="true"  label="cms:updateManager.branch.field.label"         values="release,bleedingEdge" labels="cms:updateManager.branch.release,cms:updateManager.branch.bleedingEdge" />
                 <field  sortorder="20" name="railo_admin_pw"   control="password" required="false" label="cms:updateManager.railo_admin_pw.field.label" placeholder="cms:updateManager.railo_admin_pw.field.placeholder" />
                 <field  sortorder="30" name="download_timeout" control="spinner"  required="false" label="cms:updateManager.download_timeout.field.label" default="120" />
             </fieldset>

diff --git a/support/docs/source/reference/systemforms/websitebenefitaddform.rst b/support/docs/source/reference/systemforms/websitebenefitaddform.rst
@@ -12,8 +12,9 @@ This form is used for the "add website benefit" form in the website user manager
     <form>
         <tab id="basic" sortorder="10">
             <fieldset id="basic" sortorder="10">
-                <field binding="website_benefit.label"       sortorder="10"  />
-                <field binding="website_benefit.description" sortorder="20"  />
+                <field binding="website_benefit.label"             sortorder="10"  />
+                <field binding="website_benefit.description"       sortorder="20"  />
+                <field binding="website_benefit.combined_benefits" sortorder="25"  />
                 <field name="permissions"                    sortorder="30" control="websitePermissionsPicker" label="cms:website.permissions.picker.label" help="cms:website.permissions.picker.help" />
             </fieldset>
         </tab>

diff --git a/support/docs/source/reference/systemforms/websitebenefiteditform.rst b/support/docs/source/reference/systemforms/websitebenefiteditform.rst
@@ -12,8 +12,9 @@ This form is used for the "edit website benefit" form in the website user manage
     <form>
         <tab id="basic" sortorder="10">
             <fieldset id="basic" sortorder="10">
-                <field binding="website_benefit.label"       sortorder="10"  />
-                <field binding="website_benefit.description" sortorder="20"  />
+                <field binding="website_benefit.label"             sortorder="10"  />
+                <field binding="website_benefit.description"       sortorder="20"  />
+                <field binding="website_benefit.combined_benefits" sortorder="25"  />
                 <field name="permissions"                    sortorder="30" control="websitePermissionsPicker" label="cms:website.permissions.picker.label" help="cms:website.permissions.picker.help" />
             </fieldset>
         </tab>

diff --git a/support/tests/integration/api/validation/PresideFieldRuleGeneratorTest.cfc b/support/tests/integration/api/validation/PresideFieldRuleGeneratorTest.cfc
@@ -132,7 +132,7 @@ component output="false" extends="tests.resources.HelperObjects.PresideTestCase"
 	function test12_getRulesForField_shouldReturnDateValidator_whenFieldIsDateType(){
 		var expected  = [{ fieldName="some_datefield", validator="date", message="preside-objects.test:validation.some_datefield.date.message" }];
 		var rules     = generator.getRulesForField( objectName="test", fieldName="some_datefield", fieldAttributes={
-			type = "date"
+			type = "date", dbtype="date"
 		} );
 
 		super.assertEquals( expected, rules );

diff --git a/system/assets/Gruntfile.js b/system/assets/Gruntfile.js
@@ -80,9 +80,10 @@ module.exports = function( grunt ) {
 				},{
 					  src  : [
 					  	"js/admin/lib/plugins/jquery.dataTables.js", // must come first
+					  	"js/admin/lib/plugins/jquery.moment.js", // must come first
 					  	"js/admin/lib/plugins/*.js"
 					  ]
-					, dest : "js/admin/lib/plugins-1.0.007.min.js"
+					, dest : "js/admin/lib/plugins-1.1.000.min.js"
 				},{
 					  src  : ["js/admin/lib/ace/ace.js", "js/admin/lib/ace/ace-elements.js"]
 					, dest : "js/admin/lib/ace-1.0.0.min.js"

diff --git a/system/assets/css/admin/core/_2fd1fc02.core.min.css b/system/assets/css/admin/core/_2fd1fc02.core.min.css
diff --git a/system/assets/css/admin/core/_45015059.core.min.css b/system/assets/css/admin/core/_45015059.core.min.css