Merge pull request #6 from oat-sa/develop

Develop
oat-sa-archived · Mar 27, 2015 · 9d07af3 · 9d07af3
2 parents 028f083 + bdcb142
commit 9d07af3
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/actions/class.Authentication.php b/actions/class.Authentication.php
@@ -115,7 +115,7 @@ public function login()
      */
 	public function logout()
 	{
-	    core_kernel_users_Service::singleton()->logout();
+	    $this->userService->logout();
 
 		if (!tao_helpers_Request::isAjax()) {
 			$this->redirect(_url('login', 'Main', 'tao'));

diff --git a/includes/constants.php b/includes/constants.php
@@ -24,6 +24,9 @@
 define('NS_WFENGINE', 'http://www.tao.lu/middleware/wfEngine.rdf');
 define('NS_RULES', 'http://www.tao.lu/middleware/Rules.rdf');
 $todefine = array(
+	'CLASS_WORKFLOWUSER' 				=> 'http://www.tao.lu/Ontologies/TAO.rdf#WorkflowUser',
+    'INSTANCE_ROLE_WORKFLOW'  			=> 'http://www.tao.lu/Ontologies/TAO.rdf#WorkflowRole',
+
 	'ENABLE_HTTP_REDIRECT_PROCESS_BROWSER' 			=> false,
 
 	'VAR_PROCESS_INSTANCE' 							=> NS_RULES . '#VarProcessInstance',

diff --git a/models/ontology/wfengine.rdf b/models/ontology/wfengine.rdf
@@ -828,6 +828,19 @@
     <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#Property"/>
   </rdf:Description>
 
+  <!-- WF User Role & Class -->
+  <rdf:Description rdf:about="http://www.tao.lu/Ontologies/TAO.rdf#WorkflowUser">
+  	<rdfs:subClassOf rdf:resource="http://www.tao.lu/Ontologies/TAO.rdf#User"/>
+    <rdfs:comment xml:lang="en-US"><![CDATA[Workflow User: sub class to group the workflow user, not deletable]]></rdfs:comment>
+    <rdfs:label xml:lang="en-US"><![CDATA[WfUser]]></rdfs:label>
+  </rdf:Description>
+  <rdf:Description rdf:about="http://www.tao.lu/Ontologies/TAO.rdf#WorkflowRole">
+  	<rdf:type rdf:resource="http://www.tao.lu/Ontologies/generis.rdf#UserRole"/>
+  	<generis:includesRole rdf:resource="http://www.tao.lu/Ontologies/TAO.rdf#FrontOfficeRole"/>
+  	<rdfs:label xml:lang="en-US"><![CDATA[Workflow Participant]]></rdfs:label>
+    <rdfs:comment xml:lang="en-US"><![CDATA[The Workflow Participant Role]]></rdfs:comment>
+  </rdf:Description>
+
   <!-- Management Role -->
   <rdf:Description rdf:about="http://www.tao.lu/middleware/wfEngine.rdf#WorkflowsManagerRole">
   	<rdf:type rdf:resource="http://www.tao.lu/Ontologies/TAO.rdf#ManagementRole"/>

diff --git a/views/build/grunt/bundle.js b/views/build/grunt/bundle.js
@@ -7,19 +7,20 @@ module.exports = function(grunt) {
     var root        = grunt.option('root');
     var libs        = grunt.option('mainlibs');
     var ext         = require(root + '/tao/views/build/tasks/helpers/extensions')(grunt, root);
+    var out         = 'output';
 
     /**
      * Remove bundled and bundling files
      */
-    clean.wfenginebundle = ['output',  root + '/wfEngine/views/js/controllers.min.js'];
+    clean.wfenginebundle = [out];
 
     /**
      * Compile tao files into a bundle 
      */
     requirejs.wfenginebundle = {
         options: {
             baseUrl : '../js',
-            dir : 'output',
+            dir : out,
             mainConfigFile : './config/requirejs.build.js',
             paths : { 'wfEngine' : root + '/wfEngine/views/js' },
             modules : [{
@@ -35,8 +36,8 @@ module.exports = function(grunt) {
      */
     copy.wfenginebundle = {
         files: [
-            { src: ['output/wfEngine/controller/routes.js'],  dest: root + '/wfEngine/views/js/controllers.min.js' },
-            { src: ['output/wfEngine/controller/routes.js.map'],  dest: root + '/wfEngine/views/js/controllers.min.js.map' }
+            { src: [out + '/wfEngine/controller/routes.js'],  dest: root + '/wfEngine/views/js/controllers.min.js' },
+            { src: [out + '/wfEngine/controller/routes.js.map'],  dest: root + '/wfEngine/views/js/controllers.min.js.map' }
         ]
     };