Merge remote-tracking branch 'joomla/pr/2179'

administrator/components/com_admin/sql/updates/mysql/3.2.0.sql

@@ -80,7 +80,9 @@ INSERT INTO `#__postinstall_messages` (`postinstall_message_id`, `extension_id`,
 VALUES
 (1, 700, 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_TITLE', 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_BODY', 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_ACTION', 'plg_twofactorauth_totp', 1, 'action', 'site://plugins/twofactorauth/totp/postinstall/actions.php', 'twofactorauth_postinstall_action', 'site://plugins/twofactorauth/totp/postinstall/actions.php', 'twofactorauth_postinstall_condition', '3.2.0', 1);
 
-INSERT INTO `#__content_types` (`type_id`, `type_title`, `type_alias`, `table`, `rules`, `field_mappings`, `router`, `content_history_options`) VALUES
-(null, 'Banner', 'com_banners.banner', '{"special":{"dbtable":"#__banners","key":"id","type":"Banner","prefix":"BannersTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"null","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"null", "asset_id":"null"}, "special":{"imptotal":"imptotal", "impmade":"impmade", "clicks":"clicks", "clickurl":"clickurl", "custombannercode":"custombannercode", "cid":"cid", "purchase_type":"purchase_type", "track_impressions":"track_impressions", "track_clicks":"track_clicks"}}', '', '{"form_file":"administrator\\/components\\/com_banners\\/models\\/forms\\/banner.xml", "hide_fields":["checked_out","checked_out_time","version", "reset"],"display_lookup":[{"source_column":"catid","target_table":"#__categories","target_column":"id","display_column":"title"}, {"source_column":"cid","target_table":"#__banner_clients","target_column":"id","display_column":"name"}, {"source_column":"created_by","target_table":"#__users","target_column":"id","display_column":"name"},{"source_column":"modified_by","target_table":"#__users","target_column":"id","display_column":"name"}  ]}'),
-(null, 'Banners Category', 'com_banners.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', '', '{"form_file":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml",   "hide_fields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"],   "display_lookup":[   {"source_column":"created_user_id","target_table":"#__users","target_column":"id","display_column":"name"},{"source_column":"access","target_table":"#__viewlevels","target_column":"id","display_column":"title"},{"source_column":"modified_user_id","target_table":"#__users","target_column":"id","display_column":"name"},{"source_column":"parent_id","target_table":"#__categories","target_column":"id","display_column":"title"}  ] }'),
-(null, 'Banner Client', 'com_banners.client', '{"special":{"dbtable":"#__banner_clients","key":"id","type":"Client","prefix":"BannersTable"}}', '', '', '', '{"form_file":"administrator\\/components\\/com_banners\\/models\\/forms\\/client.xml", "hide_fields":["checked_out","checked_out_time"],"display_lookup":[]}');
+INSERT INTO `#__content_types` (`type_title`, `type_alias`, `table`, `rules`, `field_mappings`, `router`, `content_history_options`) VALUES
+('Banner', 'com_banners.banner', '{"special":{"dbtable":"#__banners","key":"id","type":"Banner","prefix":"BannersTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"null","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"null", "asset_id":"null"}, "special":{"imptotal":"imptotal", "impmade":"impmade", "clicks":"clicks", "clickurl":"clickurl", "custombannercode":"custombannercode", "cid":"cid", "purchase_type":"purchase_type", "track_impressions":"track_impressions", "track_clicks":"track_clicks"}}', '', '{"form_file":"administrator\\/components\\/com_banners\\/models\\/forms\\/banner.xml", "hide_fields":["checked_out","checked_out_time","version", "reset"],"display_lookup":[{"source_column":"catid","target_table":"#__categories","target_column":"id","display_column":"title"}, {"source_column":"cid","target_table":"#__banner_clients","target_column":"id","display_column":"name"}, {"source_column":"created_by","target_table":"#__users","target_column":"id","display_column":"name"},{"source_column":"modified_by","target_table":"#__users","target_column":"id","display_column":"name"}  ]}'),
+('Banners Category', 'com_banners.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', '', '{"form_file":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml",   "hide_fields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"],   "display_lookup":[   {"source_column":"created_user_id","target_table":"#__users","target_column":"id","display_column":"name"},{"source_column":"access","target_table":"#__viewlevels","target_column":"id","display_column":"title"},{"source_column":"modified_user_id","target_table":"#__users","target_column":"id","display_column":"name"},{"source_column":"parent_id","target_table":"#__categories","target_column":"id","display_column":"title"}  ] }'),
+('Banner Client', 'com_banners.client', '{"special":{"dbtable":"#__banner_clients","key":"id","type":"Client","prefix":"BannersTable"}}', '', '', '', '{"form_file":"administrator\\/components\\/com_banners\\/models\\/forms\\/client.xml", "hide_fields":["checked_out","checked_out_time"],"display_lookup":[]}'),
+('User Notes', 'com_users.note', '{"special":{"dbtable":"#__user_notes","key":"id","type":"Note","prefix":"UsersTable"}}', '', '', '', '{"form_file":"administrator\\/components\\/com_users\\/models\\/forms\\/note.xml", "hide_fields":["checked_out","checked_out_time", "publish_up", "publish_down"],"display_lookup":[  {"source_column":"catid","target_table":"#__categories","target_column":"id","display_column":"title"},    {"source_column":"created_user_id","target_table":"#__users","target_column":"id","display_column":"name"}, {"source_column":"user_id","target_table":"#__users","target_column":"id","display_column":"name"}, {"source_column":"modified_user_id","target_table":"#__users","target_column":"id","display_column":"name"}  ]}'),
+('User Notes Category', 'com_users.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', '', '{"form_file":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml",   "hide_fields":["checked_out","checked_out_time","version","lft","rgt","level","path","extension"],   "display_lookup":[   {"source_column":"created_user_id","target_table":"#__users","target_column":"id","display_column":"name"},{"source_column":"access","target_table":"#__viewlevels","target_column":"id","display_column":"title"},{"source_column":"modified_user_id","target_table":"#__users","target_column":"id","display_column":"name"},{"source_column":"parent_id","target_table":"#__categories","target_column":"id","display_column":"title"}  ] }');

administrator/components/com_users/config.xml

@@ -184,6 +184,34 @@
 			default="0">
 			</field>
 	</fieldset>
+
+	<fieldset
+		name="user_notes_history"
+		label="COM_USERS_CONFIG_FIELD_NOTES_HISTORY" >
+
+			<field
+			name="save_history"
+			type="radio"
+			class="btn-group"
+			default="1"
+			label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
+			description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC"
+			>
+			<option
+				value="0">JNO</option>
+			<option
+				value="1">JYES</option>
+		</field>
+
+		<field
+			name="history_limit"
+			type="text"
+			filter="integer"
+			label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"
+			description="JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC"
+			default="5"
+		/>
+	</fieldset>
 
  	<fieldset
 		name="massmail"

administrator/components/com_users/models/forms/note.xml

@@ -91,24 +91,28 @@
 
 		<field
 			name="created_user_id"
+			label="JGLOBAL_FIELD_CREATED_BY_LABEL"
 			type="hidden"
 			filter="unset"
 			/>
 
 		<field
 			name="created_time"
+			label="JGLOBAL_FIELD_CREATED_LABEL"
 			type="hidden"
 			filter="unset"
 			/>
 
 		<field
 			name="modified_user_id"
+			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			type="hidden"
 			filter="unset"
 			/>
 
 		<field
 			name="modified_time"
+			label="JGLOBAL_FIELD_MODIFIED_LABEL"
 			type="hidden"
 			filter="unset"
 			/>
@@ -121,6 +125,16 @@
 		<field name="publish_down" type="calendar"
 			label="JGLOBAL_FIELD_PUBLISH_DOWN_LABEL" description="JGLOBAL_FIELD_PUBLISH_DOWN_DESC"
 			class="inputbox" format="%Y-%m-%d %H:%M:%S" size="22"
-			filter="user_utc" />			
+			filter="user_utc" />	
+
+		<field 
+			name="version_note"
+			type="text"
+			label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
+			description="JGLOBAL_FIELD_VERSION_NOTE_DESC"
+			class="inputbox" size="45"
+			labelclass="control-label"
+			/>	
+
 	</fieldset>
 </form>

administrator/components/com_users/models/note.php

@@ -18,6 +18,15 @@
  */
 class UsersModelNote extends JModelAdmin
 {
+
+	/**
+	 * The type alias for this content type.
+	 *
+	 * @var      string
+	 * @since    3.2
+	 */
+	public $typeAlias = 'com_users.note';
+
 	/**
 	 * Method to get the record form.
 	 *

administrator/components/com_users/views/note/tmpl/edit.php

@@ -63,6 +63,14 @@
 					<?php echo $this->form->getInput('review_time'); ?>
 				</div>
 			</div>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('version_note'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('version_note'); ?>
+				</div>
+			</div>
 
 			<div class="control-group">
 				<div class="control-label">

administrator/components/com_users/views/note/view.html.php

@@ -116,6 +116,13 @@ protected function addToolbar()
 			JToolbarHelper::cancel('note.cancel', 'JTOOLBAR_CLOSE');
 		}
 
+		if ($this->state->params->get('save_history') && $user->authorise('core.edit'))
+		{
+			$itemId = $this->item->id;
+			$typeAlias = 'com_users.note';
+			JToolbarHelper::versions($typeAlias, $itemId);
+		}
+
 		JToolbarHelper::divider();
 		JToolbarHelper::help('JHELP_USERS_USER_NOTES_EDIT');
 	}

administrator/language/en-GB/en-GB.com_users.ini

@@ -56,6 +56,7 @@ COM_USERS_CONFIG_FIELD_MINIMUM_UPPERCASE="Password Upper Case Minimum"
 COM_USERS_CONFIG_FIELD_MINIMUM_UPPERCASE_DESC="Set the minimum number of upper case ASCII characters required for a password."
 COM_USERS_CONFIG_FIELD_NEW_USER_TYPE_DESC="The default group that will be applied to New Users Registering via the frontend."
 COM_USERS_CONFIG_FIELD_NEW_USER_TYPE_LABEL="New User Registration Group"
+COM_USERS_CONFIG_FIELD_NOTES_HISTORY="User Notes History"
 COM_USERS_CONFIG_FIELD_SENDPASSWORD_LABEL="Send Password"
 COM_USERS_CONFIG_FIELD_SENDPASSWORD_DESC="If set to Yes the user's initial password will be emailed to the user as part of the registration mail."
 COM_USERS_CONFIG_FIELD_SUBJECT_PREFIX_DESC="This gets added in front of each mail subject."
@@ -93,7 +94,7 @@ COM_USERS_FIELD_REVIEW_TIME_LABEL="Review time"
 COM_USERS_FIELD_STATE_DESC="Set publication status."
 COM_USERS_FIELD_SUBJECT_DESC="The subject line for the note"
 COM_USERS_FIELD_SUBJECT_LABEL="Subject"
-COM_USERS_FIELD_USER_ID_LABEL="ID"
+COM_USERS_FIELD_USER_ID_LABEL="User ID"
 COM_USERS_FILTER_ACTIVE="- Active -"
 COM_USERS_FILTER_LABEL="Filter Users by: "
 COM_USERS_FILTER_NOTES="Show notes list for this user"