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.

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

Fixes #20735: Counterpart of 20734: update import for RudderUserDetails #445

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import com.normation.plugins._
import com.normation.rudder.AuthorizationType
import com.normation.rudder.rest.EndpointSchema
import com.normation.rudder.rest.lift.LiftApiModuleProvider
import com.normation.rudder.web.model.CurrentUser
import com.normation.rudder.web.services.CurrentUser
import net.liftweb.common.Empty
import net.liftweb.common.Full
import net.liftweb.http.ClasspathTemplates
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ import net.liftweb.json.JsonAST.JArray
import net.liftweb.json.JsonAST.JValue
import net.liftweb.json.JsonDSL._
import com.normation.rudder.rest.EndpointSchema.syntax._
import com.normation.rudder.web.model.CurrentUser
import com.normation.rudder.web.services.CurrentUser
import net.liftweb.common.Box
import sourcecode.Line

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import com.normation.plugins.changevalidation.TwoValidationStepsWorkflowServiceI
import com.normation.rudder.AuthorizationType
import com.normation.rudder.services.workflows.WorkflowService
import com.normation.rudder.services.workflows.WorkflowUpdate
import com.normation.rudder.web.model.CurrentUser
import com.normation.rudder.web.services.CurrentUser
import net.liftweb.common._
import net.liftweb.http._

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ import com.normation.rudder.services.workflows.NoWorkflowAction
import com.normation.rudder.services.workflows.WorkflowAction
import com.normation.rudder.web.ChooseTemplate
import com.normation.rudder.web.model._
import com.normation.rudder.web.services.CurrentUser
import com.normation.utils.DateFormaterService

import net.liftweb.common._
import net.liftweb.http._
import net.liftweb.http.js.JE._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ import com.normation.rudder.ActionType
import com.normation.rudder.domain.workflows._
import com.normation.rudder.web.ChooseTemplate
import com.normation.rudder.web.model._
import com.normation.rudder.web.services.CurrentUser

import net.liftweb.common._
import net.liftweb.http._
import net.liftweb.http.js.JsCmds._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import com.normation.rudder.domain.workflows.ChangeRequestId
import com.normation.rudder.domain.workflows.WorkflowNodeId
import com.normation.rudder.domain.workflows._
import com.normation.utils.DateFormaterService
import com.normation.rudder.web.model.CurrentUser
import com.normation.rudder.web.services.CurrentUser
import com.normation.rudder.web.services.JsTableData
import com.normation.rudder.web.services.JsTableLine
import net.liftweb.common._
Expand Down