[prev in list] [next in list] [prev in thread] [next in thread]
List: forgerock-openidm-commit
Subject: [CommitOpenIDM] [5037] trunk/openidm-ui: OPENIDM-2974
From: anonymous () forgerock ! org
Date: 2015-03-23 17:51:23
Message-ID: 20150323175123.8D7FB3F865 () sources ! internal ! forgerock ! com
[Download RAW message or body]
[Attachment #2 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[5037] trunk/openidm-ui: OPENIDM-2974 </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://sources.forgerock.org/changelog/openidm/?cs=5037">5037</a></dd> \
<dt>Author</dt> <dd>liz.browne</dd> <dt>Date</dt> <dd>2015-03-23 17:51:23 +0000 (Mon, \
23 Mar 2015)</dd> </dl>
<h3>Log Message</h3>
<pre><a href="https://bugster.forgerock.org/jira/browse/OPENIDM-2974">OPENIDM-2974</a> \
CR-6434
IDM mapping bug fix</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkopenidmuiopenidmuiadminsrcmainjsorgforgerockopenidmuiadminmappingMa \
ppingBaseViewjs">trunk/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/MappingBaseView.js</a></li>
<li><a href="#trunkopenidmuiopenidmuiadminsrcmainresourcescssstylesless">trunk/openidm-ui/openidm-ui-admin/src/main/resources/css/styles.less</a></li>
<li><a href="#trunkopenidmuiopenidmuiadminsrcmainresourceslocalesentranslationjson">t \
runk/openidm-ui/openidm-ui-admin/src/main/resources/locales/en/translation.json</a></li>
<li><a href="#trunkopenidmuiopenidmuiadminsrctestqunitmocksadminInitjs">trunk/openidm-ui/openidm-ui-admin/src/test/qunit/mocks/adminInit.js</a></li>
<li><a href="#trunkopenidmuiopenidmuiendusersrcmainresourcescssstylesless">trunk/openidm-ui/openidm-ui-enduser/src/main/resources/css/styles.less</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkopenidmuiopenidmuiadminsrcmainjsorgforgerockopenidmuiadminmappingMappingBaseViewjs"></a>
<div class="modfile"><h4>Modified: \
trunk/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/MappingBaseView.js \
(5036 => 5037)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/MappingBaseView.js 2015-03-23 \
17:07:54 UTC (rev 5036)
+++ trunk/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/MappingBaseView.js 2015-03-23 \
17:51:23 UTC (rev 5037) </span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> if(args === "null"){
</span><span class="cx"> args = \
UIUtils.getCurrentHash().split("/").slice(1); </span><span class="cx"> \
} </span><del>-
</del><ins>+
</ins><span class="cx"> this.route = { url: \
window.location.hash.replace(/^#/, '') }; </span><span class="cx"> \
this.data.docHelpUrl = constants.DOC_URL; </span><span class="cx">
</span><span class="lines">@@ -254,6 +254,8 @@
</span><span class="cx"> } else {
</span><span class="cx"> this.setSubmenu();
</span><span class="cx">
</span><ins>+ this.parentRender();
+
</ins><span class="cx"> if(callback){
</span><span class="cx"> callback();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkopenidmuiopenidmuiadminsrcmainresourcescssstylesless"></a>
<div class="modfile"><h4>Modified: \
trunk/openidm-ui/openidm-ui-admin/src/main/resources/css/styles.less (5036 => \
5037)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/openidm-ui/openidm-ui-admin/src/main/resources/css/styles.less 2015-03-23 \
17:07:54 UTC (rev 5036)
+++ trunk/openidm-ui/openidm-ui-admin/src/main/resources/css/styles.less 2015-03-23 \
17:51:23 UTC (rev 5037) </span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> /* css basic configuration */
</span><span class="cx"> @import "Roboto/fontRoboto.less";
</span><del>-@import "common/variables.less";
</del><ins>+@import "common/idm-variables.less";
</ins><span class="cx"> @import "common/common.less";
</span><span class="cx"> @import "config/adminConfig.less";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkopenidmuiopenidmuiadminsrcmainresourceslocalesentranslationjson"></a>
<div class="modfile"><h4>Modified: \
trunk/openidm-ui/openidm-ui-admin/src/main/resources/locales/en/translation.json \
(5036 => 5037)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/openidm-ui/openidm-ui-admin/src/main/resources/locales/en/translation.json 2015-03-23 \
17:07:54 UTC (rev 5036)
+++ trunk/openidm-ui/openidm-ui-admin/src/main/resources/locales/en/translation.json 2015-03-23 \
17:51:23 UTC (rev 5037) </span><span class="lines">@@ -816,7 +816,7 @@
</span><span class="cx"> "exampleResult": "Example \
result.", </span><span class="cx"> \
"currentSourceValue": "Current value for \
&quot;source&quot;", </span><span class="cx"> \
"transformScriptNote": "Use JavaScript code above to perform advanced \
mapping operations.<br>This script will be processed for each source object \
that is mapped, to calculate its value for this property.<br>The result of the \
final statement in the script will be used as the value for this \
property.<br>This script has the &quot;source&quot; variable available \
to it as input.<br>The value for the &quot;source&quot; variable \
depends on how you have defined the attribute mapping in the &quot;Attribute \
List&quot; tab.<br>If you haven't selected any value in the \
&quot;Property List&quot; tab, then &quot;source&quot; will be the \
complete source object with properties for each directory property.<br>If you \
have selected a value in &quot;Property List&quot;, then \
&quot;source&quot; will be that value.", </span><del>- \
"conditionScriptNote": "Use JavaScript code above to prevent target \
data from being updated in certain conditions.<br/>This script will be \
processed for each source object that is mapped.<br/>If the result is true or \
if there is no script the property will be updated, otherwise updates will not be \
sent to the target.<br/>This script has the &quot;object&quot; variable \
available to it as a global.<br/>The &quot;object&quot; variable \
represents the complete target record with properties for each source property \
mapping." </del><ins>+ "conditionScriptNote": "Use \
JavaScript code above to prevent target data from being updated in certain \
conditions.<br/>This script will be processed for each source object that is \
mapped.<br/>If the result is true or if there is no script the property will be \
updated, otherwise updates will not be sent to the target.<br/>This script has \
the &quot;object&quot; variable available to it as a global.<br/>The \
&quot;object&quot; variable represents the complete source record with \
properties for each source property mapping." </ins><span class="cx"> \
}, </span><span class="cx"> "propertyAdd": {
</span><span class="cx"> "title": "Choose Target \
Property", </span></span></pre></div>
<a id="trunkopenidmuiopenidmuiadminsrctestqunitmocksadminInitjs"></a>
<div class="modfile"><h4>Modified: \
trunk/openidm-ui/openidm-ui-admin/src/test/qunit/mocks/adminInit.js (5036 => \
5037)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/openidm-ui/openidm-ui-admin/src/test/qunit/mocks/adminInit.js 2015-03-23 \
17:07:54 UTC (rev 5036)
+++ trunk/openidm-ui/openidm-ui-admin/src/test/qunit/mocks/adminInit.js 2015-03-23 \
17:51:23 UTC (rev 5037) </span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> "text!css/config/adminStyle.less",
</span><span class="cx"> "text!css/config/resourcesView.less",
</span><span class="cx">
</span><del>- "text!css/fontawesome/less/variables.less",
</del><ins>+ "text!css/fontawesome/less/idm-variables.less",
</ins><span class="cx"> "text!css/fontawesome/less/mixins.less",
</span><span class="cx"> "text!css/fontawesome/less/path.less",
</span><span class="cx"> "text!css/fontawesome/less/core.less",
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> "css/config/adminStyle.less",
</span><span class="cx"> "css/config/resourcesView.less",
</span><span class="cx">
</span><del>- "css/fontawesome/less/variables.less",
</del><ins>+ "css/fontawesome/less/idm-variables.less",
</ins><span class="cx"> "css/fontawesome/less/mixins.less",
</span><span class="cx"> "css/fontawesome/less/path.less",
</span><span class="cx"> "css/fontawesome/less/core.less",
</span></span></pre></div>
<a id="trunkopenidmuiopenidmuiendusersrcmainresourcescssstylesless"></a>
<div class="modfile"><h4>Modified: \
trunk/openidm-ui/openidm-ui-enduser/src/main/resources/css/styles.less (5036 => \
5037)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/openidm-ui/openidm-ui-enduser/src/main/resources/css/styles.less 2015-03-23 \
17:07:54 UTC (rev 5036)
+++ trunk/openidm-ui/openidm-ui-enduser/src/main/resources/css/styles.less 2015-03-23 \
17:51:23 UTC (rev 5037) </span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> /* css basic configuration */
</span><span class="cx"> @import "Roboto/fontRoboto.less";
</span><del>-@import "common/variables.less";
</del><ins>+@import "common/idm-variables.less";
</ins><span class="cx"> @import "common/common.less";
</span><span class="cx">
</span><span class="cx"> /*
</span></span></pre>
</div>
</div>
<div id="footer">Copyright (c) by ForgeRock. All rights reserved.</div>
</body>
</html>
_______________________________________________
CommitOpenIDM mailing list
CommitOpenIDM@forgerock.org
https://lists.forgerock.org/mailman/listinfo/commitopenidm
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic