Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for: #451

Closed
wants to merge 4 commits into from
Closed

Fix for: #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4dc419
Fix for:
vladbar Sep 7, 2015
3e4d219
Fix for #278:
vladbar Sep 8, 2015
2e0d81d
Fix for issue #51:
vladbar Sep 10, 2015
3057506
Fix for issue #305:
vladbar Sep 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/InlineEditing/InlineEditing.php
View file
Open in desktop
Expand Up @@ -496,7 +496,7 @@ function checkAccess($bean){

$aclaccess_in_role = $bean->ACLAccess('EditView',$aclaccess_is_owner,$aclaccess_in_group);

if($aclaccess_is_owner && $aclaccess_in_role){
if($aclaccess_is_owner || $aclaccess_in_role){
return true;
}else {
return false;
Expand Down
2 changes: 1 addition & 1 deletion include/javascript/sugar_3.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions modules/ModuleBuilder/MB/MBLanguage.php
View file
Open in desktop
Expand Up @@ -184,8 +184,6 @@ function save($key_name, $duplicate=false, $rename=false){
$key_changed = ($this->key_name != $key_name);

foreach($this->appListStrings as $lang=>$values){
// Load previously created modules data
$app_list_strings = array ();
$neededFile = $app_save_path . '/'. $lang;
if (file_exists($neededFile)) {
include $neededFile;
Expand All @@ -195,9 +193,7 @@ function save($key_name, $duplicate=false, $rename=false){
if(!$duplicate){
unset($values['moduleList'][$this->key_name]);
}


$values = sugarLangArrayMerge($values, $app_list_strings);
$values['moduleList'][$key_name]= $this->label;


Expand Down
108 changes: 108 additions & 0 deletions modules/ModuleBuilder/parsers/parser.label.php
View file
Open in desktop
Expand Up @@ -235,6 +235,114 @@ static function addLabels ($language , $labels , $moduleName , $basepath = null,
}
}

// Fix for bug #51
// when the label is recreated it defaults back to the original value (In this case its "User").

// Solution:
// 1. Changes to the label names should go to custom/Extension/modules/{ModuleName}/Ext/Language
// This is done in case different users edit the same Relationship concurrently.
// The changes from custom/Extension/modules/{ModuleName}/Ext/Language
// will overwrite stuff in custom/modules/{ModuleName}/Ext/Language/en_us.lang.ext.php after
// Quick Repair and Rebuild is applied.
// 2. Also need to overwrite custom/Extension/modules/relationships/language/{ModuleName}.php
// because whenever new relationship is created this place is checked by the system to get
// all the label names
if($forRelationshipLabel) {
if(!empty($_POST[view_module]) && !empty($_POST[relationship_name]) && !empty($_POST[rhs_label]) && !empty($_POST[lhs_module])) {
// 1. Overwrite custom/Extension/modules/{ModuleName}/Ext/Language
$extension_basepath = "custom/Extension/modules/" . $_POST[view_module] . "/Ext/Language";
mkdir_recursive($extension_basepath);

$headerString = "<?php\n//THIS FILE IS AUTO GENERATED, DO NOT MODIFY\n";
$out = $headerString;

$extension_filename = "$extension_basepath/$language.custom" . $_POST[relationship_name] . ".php";

$mod_strings = array();
if (file_exists($extension_filename)) {
// obtain $mod_strings
include($extension_filename);
}

$changed_mod_strings = false;
foreach ($labels as $key => $value) {
foreach ($mod_strings as $key_mod_string => $value_mod_string) {
if (strpos($key_mod_string, strtoupper($_POST[relationship_name])) !== false) {
$mod_strings[$key_mod_string] = to_html(strip_tags(from_html($_POST[rhs_label]))); // must match encoding used in view.labels.php
$changed_mod_strings = true;
}
}
}

foreach ($mod_strings as $key => $val)
$out .= override_value_to_string_recursive2('mod_strings', $key, $val);

$failed_to_write = false;
try {
$file_contents = fopen($extension_filename, 'w');
fputs($file_contents, $out, strlen($out));
fclose($file_contents);
} catch (Exception $e) {
$GLOBALS ['log']->fatal("Could not write $filename");
$GLOBALS ['log']->fatal("Exception " . $e->getMessage());
$failed_to_write = true;
}

//2. Overwrite custom/Extension/modules/relationships/language/{ModuleName}.php
$relationships_basepath = "custom/Extension/modules/relationships/language";
mkdir_recursive($relationships_basepath);

$headerString = "<?php\n//THIS FILE IS AUTO GENERATED, DO NOT MODIFY\n";
$out = $headerString;

$relationships_filename = "$relationships_basepath/" . $_POST[lhs_module] . ".php";


$mod_strings = array();
if (file_exists($relationships_filename)) {
// obtain $mod_strings
include($relationships_filename);
}

$changed_mod_strings = false;
foreach ($labels as $key => $value) {
foreach ($mod_strings as $key_mod_string => $value_mod_string) {
if (strpos($key_mod_string, strtoupper($_POST[relationship_name])) !== false) {
$mod_strings[$key_mod_string] = to_html(strip_tags(from_html($_POST[rhs_label]))); // must match encoding used in view.labels.php
$changed_mod_strings = true;
}
}
}

foreach ($mod_strings as $key => $val)
$out .= override_value_to_string_recursive2('mod_strings', $key, $val);

$failed_to_write = false;
try {
$file_contents = fopen($relationships_filename, 'w');
fputs($file_contents, $out, strlen($out));
fclose($file_contents);
} catch (Exception $e) {
$GLOBALS ['log']->fatal("Could not write $filename");
$GLOBALS ['log']->fatal("Exception " . $e->getMessage());
$failed_to_write = true;
}

if ($changed_mod_strings) {
if (!$failed_to_write) {
// if we have a cache to worry about, then clear it now
if ($deployedModule) {
SugarCache::cleanOpcodes();
$GLOBALS ['log']->debug("PaserLabel->addLabels: clearing language cache");
$cache_key = "module_language." . $language . $moduleName;
sugar_cache_clear($cache_key);
LanguageManager::clearLanguageCache($moduleName, $language);
}
}
}
}
}

return true ;
}

Expand Down