Merge branch 'develop' into hotfix-3.7.2

.gitignore

@@ -11,4 +11,5 @@ docroot/css/.sass-cache/
 docroot/WEB-INF/src/com/liferay/lms/service/base/
 docroot/WEB-INF/service/com/liferay/lms/model
 docroot/WEB-INF/service/com/liferay/lms/service
-docroot/WEB-INF/service/com/liferay/lms/NoSuch*.java
+docroot/WEB-INF/service/com/liferay/lms/NoSuch*.java
+docroot/WEB-INF/sql

docroot/WEB-INF/liferay-plugin-package.properties

@@ -1,6 +1,7 @@
 name=liferaylms-portlet
 module-group-id=com.ted.wemooc
-module-incremental-version=3.7.4
+module-incremental-version=3.8.0
+
 tags=
 short-description=
 change-log=

docroot/WEB-INF/liferay-portlet.xml

@@ -10,6 +10,7 @@
 		<control-panel-entry-category>content</control-panel-entry-category>
 		<control-panel-entry-weight>17.5</control-panel-entry-weight>
 		<asset-renderer-factory>com.liferay.lms.asset.LearningActivityAssetRendererFactory</asset-renderer-factory>
+		<custom-attributes-display>com.liferay.lms.expando.LearningActivityCustomAttributesDisplay</custom-attributes-display>
 		<instanceable>false</instanceable>
 		<header-portlet-css>/css/main.css</header-portlet-css>
 		<footer-portlet-javascript>/js/main.js</footer-portlet-javascript>
@@ -511,6 +512,7 @@
 	<portlet>
 		<portlet-name>inscriptionadmin</portlet-name>
 		<icon>/icon.png</icon>
+		<configuration-action-class>com.liferay.portal.kernel.portlet.DefaultConfigurationAction</configuration-action-class>
 		<instanceable>false</instanceable>
 		<header-portlet-css>/css/main.css</header-portlet-css>
 		<footer-portlet-javascript>
@@ -684,6 +686,7 @@
 	<portlet>
 		<portlet-name>asynchronous-process-dashboard</portlet-name>
 		<icon>/icon.png</icon>
+		<configuration-action-class>com.liferay.lms.actions.AsynchronousConfigurationAction</configuration-action-class>
 		<header-portlet-css>/css/main.css</header-portlet-css>
 		<footer-portlet-javascript>
 			/js/main.js

docroot/WEB-INF/portlet.xml

@@ -1976,6 +1976,10 @@
 			<name>view-template</name>
 			<value>/html/inscriptionadmin/view.jsp</value>
 		</init-param>
+		<init-param>
+			<name>config-template</name>
+			<value>/html/inscriptionadmin/config.jsp</value>
+		</init-param>
 		<expiration-cache>0</expiration-cache>
 		<supports>
 			<mime-type>text/html</mime-type>
@@ -2189,7 +2193,14 @@
 		<supported-processing-event>
 			<qname xmlns:x="http://www.wemooc.com/">x:themeId</qname>
 		</supported-processing-event>
+		<supported-public-render-parameter>actId</supported-public-render-parameter>
 		<supported-public-render-parameter>moduleId</supported-public-render-parameter>
+		<supported-public-render-parameter>actionEditing</supported-public-render-parameter>
+
+		<supported-public-render-parameter>actionEditingActivity</supported-public-render-parameter>
+		<supported-public-render-parameter>actionEditingDetails</supported-public-render-parameter>
+		<supported-public-render-parameter>actionEditingModule</supported-public-render-parameter>	
+		<supported-public-render-parameter>actionCalifications</supported-public-render-parameter>
 	</portlet>
 	<portlet>
 		<portlet-name>activityViewer</portlet-name>
@@ -2572,9 +2583,13 @@
 			com.liferay.lms.portlet.AsynchronousProcessDashboard
 		</portlet-class>
 		<init-param>
-			<name>view-jsp</name>
+			<name>view-template</name>
 			<value>/html/asynchronousprocessdashboard/view.jsp</value>
 		</init-param>
+		<init-param>
+			<name>config-template</name>
+			<value>/html/asynchronousprocessdashboard/config/config.jsp</value>
+		</init-param>
 		<expiration-cache>0</expiration-cache>
 		<supports>
 			<mime-type>text/html</mime-type>

docroot/WEB-INF/service.xml

@@ -816,6 +816,7 @@
     	<column name="endDate" type="Date"></column>
     	<column name="status" type="int" />
     	<column name="statusMessage" type="String" localized="true"/>
+    	<column name="extraContent" type="String" />
     </entity>
 
     <entity name="CourseType"  local-service="true" remote-service="true" json-enabled="false">

docroot/WEB-INF/service/com/liferay/lms/InscriptionException.java

@@ -0,0 +1,21 @@
+package com.liferay.lms;
+
+import com.liferay.portal.kernel.exception.PortalException;
+
+public class InscriptionException extends PortalException {
+
+	private String key;
+
+	public InscriptionException(String key, String message) {
+		super(message);
+		this.key = key;
+	}
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+}

docroot/WEB-INF/service/com/liferay/lms/asset/LearningActivityBaseAssetRenderer.java

@@ -61,7 +61,6 @@ public abstract class LearningActivityBaseAssetRenderer extends BaseAssetRendere
 	protected static final String ACTIVITY_VIEWER_PORTLET_ID =  PortalUtil.getJsSafePortletId("activityViewer"+PortletConstants.WAR_SEPARATOR+ClpSerializer.getServletContextName());
 	public static final String LMS_EDITACTIVITY_PORTLET_ID =  PortalUtil.getJsSafePortletId("editactivity"+PortletConstants.WAR_SEPARATOR+ClpSerializer.getServletContextName());
 
-
 	private LearningActivity _learningactivity;
 	private String _nameKey;
 	private String _portletId;

docroot/WEB-INF/service/com/liferay/lms/course/adminaction/AdminActionType.java

@@ -0,0 +1,22 @@
+package com.liferay.lms.course.adminaction;
+
+import java.util.Locale;
+import java.util.Set;
+
+import javax.portlet.PortletResponse;
+
+import com.liferay.lms.model.Course;
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.upload.UploadRequest;
+import com.liferay.portal.service.ServiceContext;
+
+public interface AdminActionType 
+{
+	public long getTypeId();
+	public String getName(Locale locale);
+	public String getHelpMessage(Locale locale);
+	public String getPortletId();
+	public boolean hasPermission(long userId);
+	public String getIcon();
+}