Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
grant_program
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
Container Registry
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
Extensions
grant_program
Commits
e2264b32
Commit
e2264b32
authored
11 years ago
by
Mayur Jadhav
Browse files
Options
Downloads
Patches
Plain Diff
RG-118 fixed error notice menstion in comments as well as fixed other notices too
parent
1e9f751d
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
CRM/Grant/BAO/GrantProgram.php
+1
-1
1 addition, 1 deletion
CRM/Grant/BAO/GrantProgram.php
CRM/Grant/Form/GrantProgramView.php
+1
-1
1 addition, 1 deletion
CRM/Grant/Form/GrantProgramView.php
with
2 additions
and
2 deletions
CRM/Grant/BAO/GrantProgram.php
+
1
−
1
View file @
e2264b32
...
...
@@ -128,7 +128,7 @@ class CRM_Grant_BAO_GrantProgram extends CRM_Grant_DAO_GrantProgram {
$grantPrograms
[
$dao
->
id
]
=
$dao
->
label
;
}
}
return
$grantPrograms
;
return
empty
(
$grantPrograms
)
?
array
()
:
$grantPrograms
;
}
static
function
contributionTypes
()
{
...
...
This diff is collapsed.
Click to expand it.
CRM/Grant/Form/GrantProgramView.php
+
1
−
1
View file @
e2264b32
...
...
@@ -57,7 +57,7 @@ class CRM_Grant_Form_GrantProgramView extends CRM_Core_Form {
$this
->
assign
(
'grantProgramStatus'
,
CRM_Grant_BAO_GrantProgram
::
getOptionName
(
$values
[
'status_id'
]));
$this
->
assign
(
'contributionType'
,
$contributionTypes
[
$values
[
'financial_type_id'
]]
);
$this
->
assign
(
'grantProgramAlgorithm'
,
CRM_Grant_BAO_GrantProgram
::
getOptionName
(
$values
[
'allocation_algorithm'
]));
$this
->
assign
(
'grant_program_id'
,
$grantPrograms
[
$values
[
'grant_program_id'
]]);
$this
->
assign
(
'grant_program_id'
,
empty
(
$grantPrograms
[
$values
[
'grant_program_id'
]])
?
NULL
:
$grantPrograms
[
$values
[
'grant_program_id'
]]);
$grantTokens
=
array
(
'label'
,
'name'
,
'total_amount'
,
'remainder_amount'
,
'allocation_date'
,
'is_active'
,
'is_auto_email'
);
...
...
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