From aeefb5dfdbc014504ef512058194947e30d1b032 Mon Sep 17 00:00:00 2001
From: prasad <prasad@vtiger.com>
Date: Thu, 15 Sep 2016 15:38:28 +0530
Subject: [PATCH] Merged migration changes

---
 modules/Migration/schema/650_to_660.php       | 27 +++++++++++++
 ...igration-split-create-edit-permissions.php | 38 -------------------
 2 files changed, 27 insertions(+), 38 deletions(-)
 delete mode 100644 wip-migration-split-create-edit-permissions.php

diff --git a/modules/Migration/schema/650_to_660.php b/modules/Migration/schema/650_to_660.php
index 854c828f8..e6009c570 100644
--- a/modules/Migration/schema/650_to_660.php
+++ b/modules/Migration/schema/650_to_660.php
@@ -11,6 +11,33 @@
 if(defined('VTIGER_UPGRADE')) {
 global $adb; $db = $adb;
 
+// Migration for - #141 - Separating Create/Edit into 2 separate Role/Profile permissions
+$actionMappingResult = $adb->pquery('SELECT 1 FROM vtiger_actionmapping WHERE actionname=?', array('CreateView'));
+if (!$adb->num_rows($actionMappingResult)) {
+	$adb->pquery('INSERT INTO vtiger_actionmapping VALUES(?, ?, ?)', array(7, 'CreateView', 0));
+}
+
+$createActionResult = $adb->pquery('SELECT * FROM vtiger_profile2standardpermissions WHERE operation=?', array(1));
+$query = 'INSERT INTO vtiger_profile2standardpermissions VALUES';
+while($rowData = $adb->fetch_array($createActionResult)) {
+	$tabId			= $rowData['tabid'];
+	$profileId		= $rowData['profileid'];
+	$permissions	= $rowData['permissions'];
+	$query .= "('$profileId', '$tabId', '7', '$permissions'),";
+}
+$adb->pquery(trim($query, ','), array());
+
+require_once 'modules/Users/CreateUserPrivilegeFile.php';
+$usersResult = $adb->pquery('SELECT id FROM vtiger_users', array());
+$numOfRows = $adb->num_rows($usersResult);
+$userIdsList = array();
+for($i=0; $i<$numOfRows; $i++) {
+	$userId = $adb->query_result($usersResult, $i, 'id');
+	createUserPrivilegesfile($userId);
+}
+
+echo '<br>#141 - Successfully updated create and edit permissions<br>';
+
 // Migration for - #117 - Convert lead field mapping NULL values and redundant rows
 $phoneFieldId = getFieldid(getTabid('Leads'), 'phone');
 $db->pquery('UPDATE vtiger_convertleadmapping SET editable=? WHERE leadfid=?', array(1, $phoneFieldId));
diff --git a/wip-migration-split-create-edit-permissions.php b/wip-migration-split-create-edit-permissions.php
deleted file mode 100644
index 96724152e..000000000
--- a/wip-migration-split-create-edit-permissions.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is: vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-
-require_once 'include/utils/utils.php';
-$adb = PearDatabase::getInstance();
-
-$actionMappingResult = $adb->pquery('SELECT 1 FROM vtiger_actionmapping WHERE actionname=?', array('CreateView'));
-if (!$adb->num_rows($actionMappingResult)) {
-	$adb->pquery('INSERT INTO vtiger_actionmapping VALUES(?, ?, ?)', array(7, 'CreateView', 0));
-}
-
-$createActionResult = $adb->pquery('SELECT * FROM vtiger_profile2standardpermissions WHERE operation=?', array(1));
-$query = 'INSERT INTO vtiger_profile2standardpermissions VALUES';
-while($rowData = $adb->fetch_array($createActionResult)) {
-	$tabId			= $rowData['tabid'];
-	$profileId		= $rowData['profileid'];
-	$permissions	= $rowData['permissions'];
-	$query .= "('$profileId', '$tabId', '7', '$permissions'),";
-}
-$adb->pquery(trim($query, ','), array());
-
-require_once './modules/Users/CreateUserPrivilegeFile.php';
-$usersResult = $adb->pquery('SELECT id FROM vtiger_users', array());
-$numOfRows = $adb->num_rows($usersResult);
-$userIdsList = array();
-for($i=0; $i<$numOfRows; $i++) {
-	$userId = $adb->query_result($usersResult, $i, 'id');
-	createUserPrivilegesfile($userId);
-}
-
-echo '<br>Successfully updated create and edit permissions<br>';
\ No newline at end of file
-- 
GitLab