Merge branch 'i243' into release-1.3

rundeck · Apr 27, 2011 · 0c871ae · 0c871ae
2 parents 6d93a9b + 47c5312
commit 0c871ae
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 26 deletions.
diff --git a/rundeckapp/grails-app/controllers/FrameworkController.groovy b/rundeckapp/grails-app/controllers/FrameworkController.groovy
@@ -407,14 +407,12 @@ class FrameworkController  {
             request.error=error
         }
         def projects=frameworkService.projects(framework)
-        session.projects=projects
         return [projects:projects,project:session.project]
     }
 
     def projectSelect={
         Framework framework = frameworkService.getFrameworkFromUserSession(session,request)
         def projects=frameworkService.projects(framework)
-        session.projects=projects
         [projects:projects,project:session.project]
     }
     def selectProject= {
@@ -437,7 +435,6 @@ class FrameworkController  {
 
     static autosetSessionProject( session, Framework framework) {
         def projects=new ArrayList(framework.getFrameworkProjectMgr().listFrameworkProjects())
-        session.projects=projects
         if(null==session.project && 1==projects.size()){
             session.project=projects[0].name
         }else if(0==projects.size()){
@@ -557,7 +554,6 @@ class FrameworkController  {
     def apiProjects={
         Framework framework = frameworkService.getFrameworkFromUserSession(session,request)
         def projlist=frameworkService.projects(framework)
-        session.projects=projlist
         return new ApiController().success{ delegate->
                 delegate.'projects'(count:projlist.size()){
                     projlist.each{ pject ->

diff --git a/rundeckapp/grails-app/controllers/MenuController.groovy b/rundeckapp/grails-app/controllers/MenuController.groovy
@@ -182,7 +182,6 @@ class MenuController {
 
         Framework framework = frameworkService.getFrameworkFromUserSession(session,request)
         def projects = frameworkService.projects(framework)
-        session.projects=projects
         def usedFilter=null
         if(!query){
             query = new ScheduledExecutionQuery()

diff --git a/rundeckapp/grails-app/controllers/ScheduledExecutionController.groovy b/rundeckapp/grails-app/controllers/ScheduledExecutionController.groovy
@@ -619,7 +619,7 @@ class ScheduledExecutionController  {
         crontab = scheduledExecution.timeAndDateAsBooleanMap()
         return [ scheduledExecution:scheduledExecution, crontab:crontab,params:params,
             nextExecutionTime:scheduledExecutionService.nextExecutionTime(scheduledExecution),
-            authorized:scheduledExecutionService.userAuthorizedForJob(request,scheduledExecution,framework)]
+            authorized:scheduledExecutionService.userAuthorizedForJob(request,scheduledExecution,framework), projects: projects]
     }
 
     def renderEditFragment = {
@@ -1276,7 +1276,6 @@ class ScheduledExecutionController  {
 
         Framework framework = frameworkService.getFrameworkFromUserSession(session,request)
         def projects = frameworkService.projects(framework)
-        session.projects=projects
         def user = (session?.user) ? session.user : "anonymous"
         def rolelist = (session?.roles) ? session.roles : []
         log.info("ScheduledExecutionController: create : params: " + params)
@@ -1316,7 +1315,7 @@ class ScheduledExecutionController  {
         }
 
         log.info("ScheduledExecutionController: create : now returning model data to view...")
-        return ['scheduledExecution':scheduledExecution,params:params,crontab:[:]]
+        return ['scheduledExecution':scheduledExecution,params:params,crontab:[:],projects:projects]
     }
 
 

diff --git a/rundeckapp/grails-app/views/framework/_nodeFilterInputs.gsp b/rundeckapp/grails-app/views/framework/_nodeFilterInputs.gsp
@@ -60,22 +60,6 @@
 <g:set var="NODE_FILTERS" value="${['Name','Tags']}"/>
 <g:set var="NODE_FILTERS_X" value="${['','OsName','OsFamily','OsArch','OsVersion']}"/>
 <g:set var="NODE_FILTER_MAP" value="${['':'Hostname','OsName':'OS Name','OsFamily':'OS Family','OsArch':'OS Architecture','OsVersion':'OS Version']}"/>
-        <%--<tr>
-            <td>
-               Project
-            </td>
-            <td>
-                <g:textField name="project" size="30" value="${query?.project?.encodeAsHTML()}"/>
-                <g:if test="${filterErrors?.project}">
-                    <span class="error filter">${filterErrors?.project}</span>
-                </g:if>
-                --><!-- show popup of projects list --><!--
-                <g:if test="${session.projects}">
-                    <g:select name="project_select" value="${query?.project}" from="${session.projects}" noSelection="${['':'Select a Project...']}"/>
-                    <wdgt:eventHandler for="project_select" state="unempty" copy="value" target="project"/>
-                </g:if>
-            </td>
-        </tr>--%>
         <tr>
             <td>
                 <span class=" ${hasErrors(bean:query,field:'nodeInclude','fieldError')}">

diff --git a/rundeckapp/grails-app/views/scheduledExecution/_edit.gsp b/rundeckapp/grails-app/views/scheduledExecution/_edit.gsp
@@ -19,7 +19,7 @@
 
 <script type="text/javascript">
 //<!CDATA[
-        var selFrameworkProject='${scheduledExecution?.project?scheduledExecution?.project.encodeAsJavaScript():session.projects?.size()==1?session.projects[0].name.encodeAsJavaScript():''}';
+        var selFrameworkProject='${scheduledExecution?.project?scheduledExecution?.project.encodeAsJavaScript():projects?.size()==1?projects[0].name.encodeAsJavaScript():''}';
         var selArgs='${scheduledExecution?.argString?.encodeAsJavaScript()}';
         var isWorkflow=${isWorkflow};
 var node_filter_map =${NODE_FILTER_MAP.encodeAsJSON()};
@@ -435,7 +435,7 @@ var applinks={
         <td class="${hasErrors(bean:scheduledExecution,field:'project','fieldError')} required" id="schedProjErr">Project</td>
         <td>
             <div id="schedEditFrameworkProjectHolder">
-                <g:select id="schedEditFrameworkProject" name="project" from="${session.projects*.name}" value="${scheduledExecution.project?scheduledExecution.project.toString():session.projects?.size()==1?session.projects[0].name:session.project?session.project:''}" onchange="_editFormSelectProject(this.value);" noSelection="['':'-Choose a Project-']"/>
+                <g:select id="schedEditFrameworkProject" name="project" from="${projects*.name}" value="${scheduledExecution.project?scheduledExecution.project.toString():projects?.size()==1?projects[0].name:session.project?session.project:''}" onchange="_editFormSelectProject(this.value);" noSelection="['':'-Choose a Project-']"/>
             </div>
             <g:hasErrors bean="${scheduledExecution}" field="project">
                     <img src="${resource( dir:'images',file:'icon-small-warn.png' )}" alt="Error"  width="16px" height="16px" id="schedProjErrImg"/>