Dev: Database upgrades and more fixes

LimeSurvey · Jul 26, 2017 · 428176d · 428176d
1 parent 38d3019
commit 428176d
Show file tree

Hide file tree

Showing 16 changed files with 137 additions and 103 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -13,7 +13,7 @@
 
 $config['versionnumber'] = '3.0.0-beta.1'; //The current version of this branch
 $config['masterversion'] = '2.62.2'; //The current masters version merged into this branch
-$config['dbversionnumber'] = 308;
+$config['dbversionnumber'] = 309;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
 $config['assetsversionnumber'] = '2900';

diff --git a/application/controllers/admin/SurveymenuEntryController.php b/application/controllers/admin/SurveymenuEntryController.php
@@ -98,6 +98,7 @@ public function update($id)
 			if($model->save()){
 				$model->id = $model->getPrimaryKey();
 				$success = true;
+				SurveymenuEntries::reorderMenu($model->menu_id);
 			}
 		}
 

diff --git a/application/controllers/admin/database.php b/application/controllers/admin/database.php
@@ -1234,7 +1234,8 @@ private function _filterEmptyFields(&$oSurvey, $fieldArrayName, $newValue=null){
         switch($options['type']){
             case 'yesno':
                 if($newValue != 'Y' && $newValue != 'N')
-                    $newValue = ($newValue=='1') ? 'Y' : 'N';
+                    $newValue = (int) $newValue;
+                    $newValue = ($newValue===1) ? 'Y' : 'N';
             break;
             case 'Int' : 
                 $newValue = (int) $newValue;

diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
@@ -342,6 +342,29 @@ function db_upgrade_all($iOldDBVersion, $bSilent=false) {
             $oDB->createCommand()->update('{{settings_global}}',array('stg_value'=>308),"stg_name='DBVersion'");
             $oTransaction->commit();
         }
+        /*
+         * Add survey template editing to menu
+         */
+        if ($iOldDBVersion < 309) {
+            $oTransaction = $oDB->beginTransaction();
+            $oDB->createCommand()->insert('{{surveymenu_entries}}',array_combine(
+                array(
+                    "menu_id","ordering","name","title","menu_title","menu_description","menu_icon","menu_icon_type",
+                    "menu_link","permission","permission_grade",
+                    "data",
+                    "language","changed_at","changed_by","created_at","created_by"),
+                array(
+                    1,3,"template_options","Template options","Template options","Edit Template options for this survey","paint-brush","fontawesome",
+                    "admin/templateoptions/sa/updatesurvey","surveysettings","read",
+                    '{"render": {"link": { "pjaxed": false, "data": {"surveyid": ["survey","sid"], "gsid":["survey","gsid"]}}}}',
+                    "en-GB",date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0
+                    )
+                )
+            );
+            $oDB->createCommand()->update('{{settings_global}}',array('stg_value'=>309),"stg_name='DBVersion'");
+            $oTransaction->commit();
+            SurveymenuEntries::reorderMenu(1);
+        }
 
 
     }

diff --git a/application/models/Survey.php b/application/models/Survey.php
@@ -627,6 +627,7 @@ private function _createSurveymenuArray($oSurveyMenuObjects)
             $aResultCollected[$oSurveyMenuObject->id] = [
                 "id" => $oSurveyMenuObject->id,
                 "title" => $oSurveyMenuObject->title,
+                "ordering" => $oSurveyMenuObject->ordering,
                 "level" => $oSurveyMenuObject->level,
                 "description" => $oSurveyMenuObject->description,
                 "entries" => $entries,

diff --git a/application/models/SurveymenuEntries.php b/application/models/SurveymenuEntries.php
@@ -73,19 +73,18 @@ public function relations()
 		);
 	}
 
-	public function reorderMenu($menuId){
+	public static function reorderMenu($menuId){
 		$criteriaItems = new CDbCriteria();
 		$criteriaItems->addCondition(['menu_id = :menu_id']);
 		$criteriaItems->order='ordering ASC';
 		$criteriaItems->params = ['menu_id' => (int) $menuId];
-		$menuEntriesInMenu = SurveymenuEntries::model()->find(criteriaItems);
+		$menuEntriesInMenu = SurveymenuEntries::model()->findAll($criteriaItems);
 
 		$statistics =
 		Yii::app()->db->createCommand()->select('MIN(ordering) as lowOrder, MAX(ordering) as highOrder, COUNT(id) as count')
 				->from('{{surveymenu_entries}}')
 				->where(['menu_id = :menu_id'],['menu_id' => (int) $menuId])
-				->queryAll();
-
+				->queryRow();
 		if( ($statistics['lowOrder'] != 1) || ($statistics['highOrder'] != $statistics['count']) ){
 			$current = 1;
 			foreach($menuEntriesInMenu as $menuEntry){

diff --git a/assets/packages/adminpanel/build/lsadminpanel.js b/assets/packages/adminpanel/build/lsadminpanel.js
@@ -29562,15 +29562,15 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
     computed: {
         sortedMenues() {
             return __WEBPACK_IMPORTED_MODULE_1_lodash___default.a.orderBy(this.$store.state.sidemenus, a => {
-                return parseInt(a.order || 999999);
+                return parseInt(a.ordering || 999999);
             }, ['asc']);
         }
     },
     methods: {
         sortedMenuEntries(entries) {
             const self = this;
             let orderedArray = __WEBPACK_IMPORTED_MODULE_1_lodash___default.a.orderBy(entries, a => {
-                return parseInt(a.order || 999999);
+                return parseInt(a.ordering || 999999);
             }, ['asc']);
             return orderedArray;
         },
@@ -29767,7 +29767,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
     computed: {
         sortedMenuEntries() {
             return __WEBPACK_IMPORTED_MODULE_1_lodash___default.a.orderBy(this.menu.entries, a => {
-                return parseInt(a.order || 999999);
+                return parseInt(a.ordering || 999999);
             }, ['asc']);
         }
     },
@@ -30058,15 +30058,15 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
     computed: {
         sortedMenues() {
             return __WEBPACK_IMPORTED_MODULE_1_lodash___default.a.orderBy(this.$store.state.collapsedmenus, a => {
-                return parseInt(a.order || 999999);
+                return parseInt(a.ordering || 999999);
             }, ['asc']);
         }
     },
     methods: {
         sortedMenuEntries(entries) {
             const self = this;
             let orderedArray = __WEBPACK_IMPORTED_MODULE_1_lodash___default.a.orderBy(entries, a => {
-                return parseInt(a.order || 999999);
+                return parseInt(a.ordering || 999999);
             }, ['asc']);
             return orderedArray;
         },

diff --git a/assets/packages/adminpanel/build/lsadminpanel.js.map b/assets/packages/adminpanel/build/lsadminpanel.js.map
diff --git a/assets/packages/adminpanel/src/components/subcomponents/_quickmenu.vue b/assets/packages/adminpanel/src/components/subcomponents/_quickmenu.vue
@@ -16,13 +16,13 @@ export default {
     },
     computed: {
         sortedMenues(){
-            return _.orderBy(this.$store.state.collapsedmenus,(a)=>{return parseInt((a.order || 999999)) }, ['asc']);
+            return _.orderBy(this.$store.state.collapsedmenus,(a)=>{return parseInt((a.ordering || 999999)) }, ['asc']);
         }
     },
     methods:{
         sortedMenuEntries(entries) {
             const self = this;
-            let orderedArray = _.orderBy(entries,(a)=>{return parseInt((a.order || 999999)) }, ['asc']);            
+            let orderedArray = _.orderBy(entries,(a)=>{return parseInt((a.ordering || 999999)) }, ['asc']);            
             return orderedArray;
         },
         setActiveMenuIndex(menuItem){

diff --git a/assets/packages/adminpanel/src/components/subcomponents/_sidemenu.vue b/assets/packages/adminpanel/src/components/subcomponents/_sidemenu.vue
@@ -22,13 +22,13 @@ export default {
     },
     computed: {
         sortedMenues(){
-            return _.orderBy(this.$store.state.sidemenus,(a)=>{return parseInt((a.order || 999999)) }, ['asc']);
+            return _.orderBy(this.$store.state.sidemenus,(a)=>{return parseInt((a.ordering || 999999)) }, ['asc']);
         }
     },
     methods:{
         sortedMenuEntries(entries) {
             const self = this;
-            let orderedArray = _.orderBy(entries,(a)=>{return parseInt((a.order || 999999)) }, ['asc']);            
+            let orderedArray = _.orderBy(entries,(a)=>{return parseInt((a.ordering || 999999)) }, ['asc']);            
             return orderedArray;
         },
         setActiveMenuIndex(menuItem){

diff --git a/assets/packages/adminpanel/src/components/subcomponents/_submenu.vue b/assets/packages/adminpanel/src/components/subcomponents/_submenu.vue
@@ -20,7 +20,7 @@ export default {
     },
     computed: {
         sortedMenuEntries() {
-            return _.orderBy(this.menu.entries,(a)=>{return parseInt((a.order || 999999)) }, ['asc']);
+            return _.orderBy(this.menu.entries,(a)=>{return parseInt((a.ordering || 999999)) }, ['asc']);
         },
     },
     methods:{

diff --git a/assets/styles-admin/Sea_Green/scripts/save.js b/assets/styles-admin/Sea_Green/scripts/save.js
@@ -66,6 +66,11 @@ if ($('#save-button').length > 0){
         ev.preventDefault();
         var $form = getForm(this);
         formSubmitting = true;
+
+        for(var instanceName in CKEDITOR.instances) {
+            CKEDITOR.instances[instanceName].updateElement();
+        }
+
         $form.find('[type="submit"]').first().trigger('click');
     });
 }