Merge branch 'sprint/185' into 'sgm_fixbug'

# Conflicts:
#   framework/base/router.class.php

Makefile

@@ -17,7 +17,6 @@ clean:
 	rm -fr build/linux/lampp
 	rm -fr lampp
 	rm -fr zentaoxx
-	rm -fr xuanxuan/www/data/xuanxuan/web/
 common:
 	mkdir zentaopms
 	cp -fr api zentaopms/
@@ -54,7 +53,6 @@ common:
 	mkdir zentaopms/www/data/notify/
 zentaoxx:
 	#xuanxuan
-	cp -rf ~/packageTest/web/ xuanxuan/www/data/xuanxuan/
 	mkdir -p zentaoxx/config/ext
 	mkdir -p zentaoxx/lib
 	mkdir -p zentaoxx/extension/xuan
@@ -161,6 +159,7 @@ pms:
 	zip -rq -9 ZenTaoPMS.$(VERSION).zip zentaopms
 	rm -fr zentaopms zentaoxx zentaoxx.*.zip
 ci:
+	git pull
 	make common
 	make zentaoxx
 	unzip zentaoxx.*.zip

extension/lite/workflowdatasource/ext/view/create.flow.html.hook.php

@@ -1,4 +1,6 @@
 <script>
 $('#submit').after('<input type="hidden" id="vision" name="vision" value="<?php echo $this->config->vision;?>">');
+$("#name").parent().addClass('required');
+$("#datasource").addClass('required');
 </script>
 <?php include $this->app->getExtensionRoot() . 'biz/workflowdatasource/ext/view/' . basename(__FILE__);?>

extension/lite/workflowrule/ext/view/create.flow.html.hook.php

@@ -0,0 +1,4 @@
+<script>
+$("#name").parent().addClass('required');
+$("#rule").parent().addClass('required');
+</script>

module/action/model.php

@@ -48,7 +48,7 @@ class actionModel extends model
         $action->action     = $actionType;
         $action->date       = helper::now();
         $action->extra      = $extra;
-        $action->vision     = $this->config->vision;
+        if(!defined('IN_UPGRADE')) $action->vision = $this->config->vision;
 
         if($objectType == 'story' and strpos(',reviewpassed,reviewrejected,reviewclarified,', ",$actionType,") !== false) $action->actor = $this->lang->action->system;
 

module/user/lang/en.php

@@ -42,6 +42,7 @@ $lang->user->address          = 'Address';
 $lang->user->zipcode          = 'ZipCode';
 $lang->user->join             = 'Joined';
 $lang->user->visits           = 'Visits';
+$lang->user->visions          = 'Version Type';
 $lang->user->ip               = 'Last IP';
 $lang->user->last             = 'Last Login';
 $lang->user->ranzhi           = 'Zdoo Account';