Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
Curriculum-Request
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tim Steiner
Curriculum-Request
Commits
3862c1b2
Commit
3862c1b2
authored
16 years ago
by
Tim Steiner
Browse files
Options
Downloads
Patches
Plain Diff
Edit links on the View Request screen if the user has the ability to.
parent
f596a8c5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
application/modules/courses/controllers/ViewController.php
+2
-1
2 additions, 1 deletion
application/modules/courses/controllers/ViewController.php
application/modules/requests/controllers/IndexController.php
+4
-0
4 additions, 0 deletions
application/modules/requests/controllers/IndexController.php
with
6 additions
and
1 deletion
application/modules/courses/controllers/ViewController.php
+
2
−
1
View file @
3862c1b2
...
...
@@ -5,6 +5,7 @@ class Courses_ViewController extends App_Controller_Action
public
function
indexAction
()
{
$requestId
=
$this
->
getRequest
()
->
getParam
(
'id'
);
$myRequestSession
=
new
Zend_Session_Namespace
(
'My Requests'
);
if
(
$requestId
==
'session'
)
{
$session
=
new
Zend_Session_Namespace
(
'Edit Request'
);
$request
=
$session
->
request
;
...
...
@@ -28,7 +29,6 @@ class Courses_ViewController extends App_Controller_Action
$preview
=
false
;
// if we can know our role, we can create next and prev links.
$myRequestSession
=
new
Zend_Session_Namespace
(
'My Requests'
);
$roleId
=
$myRequestSession
->
lastRoleId
;
$list
=
$myRequestSession
->
lastList
;
if
(
$roleId
)
{
...
...
@@ -61,6 +61,7 @@ class Courses_ViewController extends App_Controller_Action
$this
->
view
->
isRequestValid
=
$course
->
isValid
()
&&
$request
->
isValid
();
$this
->
view
->
prevRequestId
=
$prevRequestId
;
$this
->
view
->
nextRequestId
=
$nextRequestId
;
$this
->
view
->
canEdit
=
in_array
(
$request
->
getId
(),
$myRequestSession
->
editableRequests
);
$session
=
new
Zend_Session_Namespace
(
__CLASS__
);
if
(
$session
->
tabName
)
{
...
...
This diff is collapsed.
Click to expand it.
application/modules/requests/controllers/IndexController.php
+
4
−
0
View file @
3862c1b2
...
...
@@ -182,6 +182,7 @@ class Requests_IndexController extends App_Controller_Action
// save the order of requests to the session so we can have next/previous links on other pages.
$session
=
new
Zend_Session_Namespace
(
'My Requests'
);
$session
->
requestOrder
=
array
();
$session
->
editableRequests
=
array
();
foreach
(
$roleData
as
$role
)
{
$roleId
=
$role
[
'role'
]
->
getId
();
$session
->
requestOrder
[
$roleId
]
=
array
();
...
...
@@ -189,6 +190,9 @@ class Requests_IndexController extends App_Controller_Action
foreach
(
$role
[
'requests'
]
as
$request
)
{
$requestId
=
$request
[
'request'
]
->
getId
();
$session
->
requestOrder
[
$roleId
][
'normal'
][]
=
$requestId
;
if
(
$request
[
'request'
]
->
isEditable
())
{
$session
->
editableRequests
[]
=
$requestId
;
}
}
$session
->
requestOrder
[
$roleId
][
'watching'
];
foreach
(
$role
[
'watchingRequests'
]
as
$request
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment