Changeset 19651

Timestamp:

02/03/12 18:13:10 (4 months ago)

Author:

anp

Message:

simpleTask : gestion des permissions

Location:

trunk

Files:

• Wsp_Modeling/spaces/gen/modelBuilder/bs/sm_simpleTask.xml (modified) (2 diffs)
• Xul_Core/content/Core/widgets/jsForm/jsForm.jsm (modified) (3 diffs)
• Xul_Core/content/Core/widgets/jsForm/jsForm.xbl.xml (modified) (3 diffs)
• Xul_Wsp/content/Wsp/widgets/jsForm/wspJsForm.xbl.xml (modified) (1 diff)

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs/sm_simpleTask.xml

@@ -336 +336 @@
                                                 <xsl:if test="sm:help">.setDescription("<xsl:value-of select="sm:help/@quickHelp"/>")</xsl:if>
                                                 <!-- sm:perms -->
-                                                <!-- TODO perms 
-                                                .addWritePermName()
-                                                .addPermissionName()
-                                                -->
+                                                <xsl:if test="sm:perms/sm:writePerm/@sc:refUri">.addWritePermName("<xsl:value-of select="resultatAgent(concat('@', getIdFromPath(sm:perms/sm:writePerm/@sc:refUri), '/codePerm'))"/>")</xsl:if>
+                                                <xsl:if test="$pFormWidget/sm:perms/sm:writePerm/@sc:refUri">.addWritePermName("<xsl:value-of select="resultatAgent(concat('@', getIdFromPath($pFormWidget/sm:perms/sm:writePerm/@sc:refUri), '/codePerm'))"/>")</xsl:if>
                                         </xsl:template>
                                         
@@ -407 +405 @@
                         </page>
                 </affichage>
+        </valeur>
+        
+        <!-- @API : peuplement des buffers de gestion des droits -->
+        <valeur code="fillMapRights">
+                <source type="xpathOnSrc-dynamique">execute(concatExpr(//*[local-name()='addRight' or local-name()='writePerm'], resultatAgent(concat('@', getIdFromPath(@sc:refUri), '/fillMapRights'))))</source>
         </valeur>
         

trunk/Xul_Core/content/Core/widgets/jsForm/jsForm.jsm

@@ -42 +42 @@
         isReadOnly: function(pContext) {
                 if(this.fReadOnly == true) return true;
-                var vPerms = this.getWritePerms();
-                if (!vPerms) return false;
+                var vPerms = this.getWritePerms(pContext);
+                if (!vPerms || !pContext) return false;
                 var vSecurityCtx = pContext.scSecurityCtx || pContext.window.scSecurityCtx;
                 if (!vSecurityCtx) return false;
@@ -57 +57 @@
         /** Ajoute une permission par son nom. La perm devra être résolu en fonction du contexte à l'execution du isReadOnly(pContext). */
         addWritePermName:function(pPermName){
-                //TODO
-        },
-        
-        getWritePerms: function () {
-                return this.fWritePerms;
+                if(!this.fWritePermsNameArray) this.fWritePermsNameArray=[];
+                this.fWritePermsNameArray.push(pPermName);
+                return this;
+        },
+        
+        getWritePerms: function (pContext) {
+                try{
+                        if(!this.fWritePermsNameArray || !pContext){
+                                return this.fWritePerms;
+                        }else{
+                                var vPermsArray = Array.isArray(this.fWritePerms) ? this.fWritePerms.clone() : [];
+                                if(this.fWritePerms && !Array.isArray(this.fWritePerms)) vPermsArray.push(this.fWritePerms);
+                                var vSecurityCtx = pContext.scSecurityCtx || pContext.window.scSecurityCtx;
+                                if(vSecurityCtx){
+                                        vPermsArray = vPermsArray.concat(vSecurityCtx.getPerms(this.fWritePermsNameArray.join(" ")));
+                                }
+                                return vPermsArray;
+                        }
+                }catch(e){log.debug(e)}
         },
         
@@ -121 +135 @@
                 if (vLabel) vInput.setAttribute('label', vLabel);
                 
-                if (this.isReadOnly()) vInput.setAttribute('readonly', 'true');
-                if (this.isRequired()) vInput.setAttribute('required', 'true');
+                if (this.isReadOnly(pContext)) vInput.setAttribute('readonly', 'true');
+                if (this.isRequired(pContext)) vInput.setAttribute('required', 'true');
                 
                 var vDescription = this.getDescription(pContext);

trunk/Xul_Core/content/Core/widgets/jsForm/jsForm.xbl.xml

@@ -535 +535 @@
                                 <xul:label anonid="label" xbl:inherits="value=label" />
                                 <xul:hbox align="top" xbl:inherits="tooltiptext=description">
-                                        <xul:toolbarbutton anonid="clear" class="smallbutton" xbl:inherits="disabled,disabled=readonly" oncommand="document.getBindingParent(this)._DeleteValue()"/>
+                                        <xul:toolbarbutton anonid="clear" class="smallbutton" xbl:inherits="disabled,collapsed=readonly" oncommand="document.getBindingParent(this)._DeleteValue()"/>
                                         <xul:datepicker anonid="input" isnull="true" xbl:inherits="disabled,readonly,required" type="popup"/>
                                 </xul:hbox>
@@ -558 +558 @@
                         <property name="fInputNode" onget="return document.getAnonymousElementByAttribute(this, 'anonid', 'input')" />
                         <property name="fBtn" onget="return document.getAnonymousElementByAttribute(this, 'anonid', 'clear')" />
+                        <property name="readonly" onget="return this.getAttribute('readonly')=='true'" />
                         
                         <!-- @param pFormat[optionnel] [XML(défaut)|timestamp] -->
@@ -612 +613 @@
                                 this.dispatchDirtyEvent();
                         </handler>
-                        <handler event="focus">
-                                if(this.fInputNode.isnull){
+                        <handler event="focus"><![CDATA[
+                                if(!this.readonly && this.fInputNode.isnull){
                                         this.fInputNode.isnull = false;
                                         this.dispatchDirtyEvent();
                                 }
-                        </handler>
+                        ]]></handler>
                 </handlers>
         </binding>

trunk/Xul_Wsp/content/Wsp/widgets/jsForm/wspJsForm.xbl.xml

@@ -54 +54 @@
                                 <xul:xedToolBar anonid="toolBar" style="-moz-binding: url(chrome://scenariXedLib/content/libUiBase/widgets/xedUiBase.xbl.xml#xedToolBar);" />
                         </xul:hbox>
-                        <xul:editXedBox anonid="xedBox" class="maskIfClosed" hideStructBar="true" xmlErrorsAllowed="false" style="-moz-binding: url(chrome://scenariXedLib/content/core/xed.xbl.xml#xedBoxNoScroll);" xbl:inherits="hideStructBar,xmlErrorsAllowed,tooltiptext=description"/>
+                        <xul:editXedBox anonid="xedBox" class="maskIfClosed" hideStructBar="true" xmlErrorsAllowed="false" style="-moz-binding: url(chrome://scenariXedLib/content/core/xed.xbl.xml#xedBoxNoScroll);" xbl:inherits="hideStructBar,xmlErrorsAllowed,tooltiptext=description,readonly"/>
                 </content>
                 <implementation>