Fixed issue: Conditions not properly converted to expressions on upda…

…te from a previous version git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@12183 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Jan 24, 2012 · 637474d · 637474d
1 parent 974fcab
commit 637474d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/application/helpers/update/upgrade-mssql_helper.php b/application/helpers/update/upgrade-mssql_helper.php
@@ -547,6 +547,7 @@ function db_upgrade($oldversion) {
     if ($oldversion < 154)
     {
         modifyDatabase("","ALTER TABLE [prefix_groups] ADD [grelevance] text DEFAULT NULL;"); echo $modifyoutput; flush();@ob_flush();
+        LimeExpressionManager::UpgradeConditionsToRelevance();
         modifyDatabase("", "UPDATE [prefix_settings_global] SET stg_value='154' WHERE stg_name='DBVersion'"); echo $modifyoutput; flush();@ob_flush();
     }
     if ($oldversion < 155)

diff --git a/application/helpers/update/upgrade-mssqlnative_helper.php b/application/helpers/update/upgrade-mssqlnative_helper.php
@@ -550,6 +550,7 @@ function db_upgrade($oldversion) {
     if ($oldversion < 154)
     {
         modifyDatabase("","ALTER TABLE [prefix_groups] ADD [grelevance] text DEFAULT NULL;"); echo $modifyoutput; flush();@ob_flush();
+        LimeExpressionManager::UpgradeConditionsToRelevance();
         modifyDatabase("","update [prefix_settings_global] set [stg_value]='154' where stg_name='DBVersion'"); echo $modifyoutput; flush();@ob_flush();
     }
     if ($oldversion < 155)

diff --git a/application/helpers/update/upgrade-mysql_helper.php b/application/helpers/update/upgrade-mysql_helper.php
@@ -661,6 +661,7 @@ function db_upgrade($oldversion) {
     if ($oldversion < 154)
     {
         modifyDatabase("","ALTER TABLE `prefix_groups` ADD `grelevance` text DEFAULT NULL;"); echo $modifyoutput; flush();@ob_flush();
+        LimeExpressionManager::UpgradeConditionsToRelevance();
         modifyDatabase("","update `prefix_settings_global` set `stg_value`='154' where stg_name='DBVersion'"); echo $modifyoutput; flush();@ob_flush();
     }
     if ($oldversion < 155)

diff --git a/application/helpers/update/upgrade-postgres_helper.php b/application/helpers/update/upgrade-postgres_helper.php
@@ -385,6 +385,7 @@ function db_upgrade($oldversion) {
     if ($oldversion < 154)
     {
         modifyDatabase("","ALTER TABLE prefix_groups ADD grelevance text DEFAULT NULL;"); echo $modifyoutput; flush();@ob_flush();
+        LimeExpressionManager::UpgradeConditionsToRelevance();
         modifyDatabase("", "UPDATE prefix_settings_global SET stg_value='154' WHERE stg_name='DBVersion'"); echo $modifyoutput; flush();@ob_flush();
     }
     if ($oldversion < 155)

diff --git a/application/views/admin/user/editusers.php b/application/views/admin/user/editusers.php
@@ -72,8 +72,8 @@
                         <?php }
                         if (Yii::app()->session['loginID'] == "1" && $usr['parent_id'] !=1 ) { ?>
 
-                        <form method='post' action='<?php echo $scriptname;?>'>
-                            <input type='submit' value='<?php $clang->eT("Take ownership");?>' />
+                        <form method='post' action='<?php echo $this->createUrl("admin/user/setasadminchild/");?>'>
+                            <input type='image' src='<?php echo $imageurl;?>/takeownership.png' alt='<?php $clang->eT("Take ownership");?>' />
                             <input type='hidden' name='action' value='setasadminchild' />
                             <input type='hidden' name='user' value='<?php echo $usr['user'];?>' />
                             <input type='hidden' name='uid' value='<?php echo $usr['uid'];?>' />