Changeset 15915

Timestamp:

01/24/12 05:19:32 (4 months ago)

Author:

Anton Lesnikov

Message:

Improvements in ACL Level creation

Location:

trunk

Files:

• inc/classes/BxDolAclQuery.php (modified) (1 diff)
• modules/boonex/english/install/data/langs/en.xml (modified) (2 diffs)
• studio/classes/BxDolStudioPermissionsLevels.php (modified) (1 diff)
• studio/templates/base/scripts/BxBaseStudioNavigationMenus.php (modified) (2 diffs)
• studio/templates/base/scripts/BxBaseStudioPermissionsLevels.php (modified) (4 diffs)

trunk/inc/classes/BxDolAclQuery.php

@@ -57 +57 @@
                 $sWhereClause .= "AND `tal`.`Active`='yes' AND `tal`.`Purchasable`='yes'";
                 break;
-            case 'all':
-                break;
             case 'all_pair':
                 $aMethod['name'] = "getPairs";
                 $aMethod['params'][1] = 'id';
                 $aMethod['params'][2] = 'name';
+                break;
+            case 'all_order_id':
+                $sOrderClause = "ORDER BY `tal`.`ID` ASC";
+                break;
+            case 'all':
                 break;
         }

trunk/modules/boonex/english/install/data/langs/en.xml

@@ -2079 +2079 @@
     <string name="_adm_prm_txt_level_create_popup"><![CDATA[Add New Level]]></string>
     <string name="_adm_prm_txt_level_edit_popup"><![CDATA[Edit "{0}" Level]]></string>
+    <string name="_adm_prm_err_level_id"><![CDATA[Membership levels limit is reached.]]></string>
     <string name="_adm_prm_txt_level_name"><![CDATA[Title]]></string>
     <string name="_adm_prm_dsc_level_name"><![CDATA[Short name for the membership level (i.e Premium, Gold, Newcomer, etc.)]]></string>
@@ -2100 +2101 @@
     <string name="_adm_prm_btn_level_cancel"><![CDATA[Cancel]]></string>
     <string name="_adm_prm_err_level_create"><![CDATA[Cannot create membership level]]></string>
+    <string name="_adm_prm_err_level_edit"><![CDATA[Cannot update membership level]]></string>
     <string name="_adm_prm_err_level_delete"><![CDATA[Cannot delete membership level]]></string>
     <string name="_adm_prm_txt_level_unauthenticated"><![CDATA[Unauthenticated]]></string>

trunk/studio/classes/BxDolStudioPermissionsLevels.php

@@ -12 +12 @@
 bx_import('BxDolStudioTemplate');
 bx_import('BxDolStudioPermissionsQuery');
+
+define('BX_DOL_STUDIO_PERMISSIONS_LEVEL_ID_INT_MAX', round(log(PHP_INT_MAX, 2)));
 
 class BxDolStudioPermissionsLevels extends BxTemplStudioGrid {

trunk/studio/templates/base/scripts/BxBaseStudioNavigationMenus.php

@@ -214 +214 @@
     }
 
-    protected function updateSetFields(&$oForm) {
-        if($oForm->getCleanValue('set_name') != $this->sCreateNew)
-            unset($oForm->aInputs['set_title']['checker']);
-        else
-            unset($oForm->aInputs['set_title']['tr_attrs']['style']);
-    }
-
     public function performActionEdit() {
         $sAction = 'edit';
@@ -555 +548 @@
         return  $sContent;
     }
+
+    protected function updateSetFields(&$oForm) {
+        if($oForm->getCleanValue('set_name') != $this->sCreateNew)
+            unset($oForm->aInputs['set_title']['checker']);
+        else
+            unset($oForm->aInputs['set_title']['tr_attrs']['style']);
+    }
 }
 /** @} */

trunk/studio/templates/base/scripts/BxBaseStudioPermissionsLevels.php

@@ -173 +173 @@
 
         if($oForm->isSubmittedAndValid()) {
+            if(($iId = $this->getAvailableId()) === false) {
+                $this->_echoResultJson(array('msg' => _t('_adm_prm_err_level_id')), true);
+                return;
+            }
+
             $mixedIcon = 'acl-authenticated.png';
             if(!empty($_FILES['Icon']['tmp_name'])) {
@@ -197 +202 @@
             $oForm->setSubmittedValue('Name', $sTitleKey, $aForm['form_attrs']['method']);
 
-            $iId = (int)$oForm->insert(array('Icon' => $mixedIcon, 'Order' => $this->oDb->getLevelOrderMax() + 1));
+            $iId = (int)$oForm->insert(array('ID' => $iId, 'Icon' => $mixedIcon, 'Order' => $this->oDb->getLevelOrderMax() + 1));
             if($iId != 0) {
                 bx_import('BxDolStudioLanguagesUtils');
@@ -392 +397 @@
                 $aRes = array('grid' => $this->getCode(false), 'blink' => $iId);
             else
-                $aRes = array('msg' => _t('_adm_prm_err_level_create'));
+                $aRes = array('msg' => _t('_adm_prm_err_level_edit'));
 
             $this->_echoResultJson($aRes, true);
@@ -518 +523 @@
         return  parent::_getActionDefault($sType, $sKey, $a, false, $isDisabled, $aRow);
     }
+
+    protected function getAvailableId() {
+        $aLevels = array();
+        $this->oDb->getLevels(array('type' =>'all_order_id'), $aLevels, false);
+
+        $iId = 1;
+        foreach($aLevels as $aLevel) {
+            if($iId != (int)$aLevel['id'])
+                break;
+
+            $iId++;
+        }
+
+        return $iId <= BX_DOL_STUDIO_PERMISSIONS_LEVEL_ID_INT_MAX ? $iId : false;
+    }
 }
 /** @} */