Skip to content

Commit e756be1

Browse files
author
cristiansitov
committed
resolved merge issues
2 parents 7f8674c + dcdc598 commit e756be1

File tree

14 files changed

+611
-51
lines changed

14 files changed

+611
-51
lines changed

‎.htaccess

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
RewriteEngine On
22

3+
#RewriteBase /ProjectsLounge/
4+
35
RewriteRule ^(application|modules|system) - [F,L]
46

57
RewriteCond %{REQUEST_FILENAME} !-f
68
RewriteCond %{REQUEST_FILENAME} !-d
7-
RewriteRule .* index.php/$0 [PT,L]
9+
RewriteRule ^(.*)$ index.php/$1 [PT,L]

‎application/config/config.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
* 3 - Notices
8383
* 4 - Debugging
8484
*/
85-
$config['log_threshold'] = 1;
85+
$config['log_threshold'] = 4;
8686

8787
/**
8888
* Message logging directory.

‎application/config/routes.php

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
<?php
22

33
$config['_default'] = 'homepage';
4-
$config[ 'hello' ] = 'projects';

‎application/logs/2010-03-27.log.php

+389
Large diffs are not rendered by default.

‎modules/auth/models/user.php

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
<?php defined('SYSPATH') OR die('No direct access allowed.');
22

33
class User_Model extends Auth_User_Model {
4-
// This class can be replaced or extended
5-
4+
65
public function save(){
76

8-
97
if( empty( $this->username ) )
108
$this->username = $this->id;
119

1210
return parent::save();
1311
}
1412

13+
1514
public function role_for_project( $project ){
15+
1616
if( ! ( $project instanceof Project_Model ) )
1717
$project = ORM::factory( 'project', $project );
18-
19-
return Database::instance()->select( 'role' )
20-
->where( 'user_id', $this->id )
21-
->where( 'project_id', $project->id )
22-
->get( 'projects_users' )->current()->role;
23-
18+
19+
return ORM::factory( 'project_user_role' )
20+
->where( 'project_id', $project->id )
21+
->where( 'user_id', $this->id )
22+
->find_all()->current();
2423
}
2524
} // End User Model

‎modules/projects/config/routes.php

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?php
2+
3+
$config = array(
4+
'/projects/(\d+)/edit' => 'projects/edit/$1'
5+
);

‎modules/projects/controllers/projects.php

+50-5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ class Projects_Controller extends Template_Controller{
77

88
public function index(){
99

10+
$projects = ORM::factory( 'project' )->find_all();
11+
$this->template->content = View::factory( 'projects/list' )
12+
->bind( 'projects', $projects )
13+
->bind( 'user', Auth::instance()->get_user() );
1014

1115
}
1216

@@ -16,7 +20,7 @@ public function project( $id ){
1620
$data = array();
1721

1822
$data[ 'project' ] = ORM::factory( 'project', $id );
19-
23+
$data[ 'user' ] = Auth::instance()->get_user();
2024
$this->template->content = View::factory( 'projects/view', $data );
2125
}
2226

@@ -29,16 +33,57 @@ public function __call( $method, $arguments ){
2933

3034
public function add(){
3135

36+
$user = Auth::instance()->get_user();
37+
3238
if( $post = $this->input->post( 'project' ) ){
39+
if( ! $user )
40+
return $this->template->content = 'You need to be logged in';
41+
42+
$project = ORM::factory( 'project' );
43+
44+
$validation = Projects_utils::projects_add_validation( $post );
45+
46+
if( !$project->validate( $validation, true ) )
47+
return $this->template->content = Kohana::debug( $validation->errors() );
48+
49+
$post_user_data = $this->input->post( 'user' );
50+
51+
if( ! empty( $post_user_data[ 'role' ] ) )
52+
$project->set_user_roles( array( $user->id => $post_user_data[ 'role' ] ) );
53+
54+
return url::redirect( $project->url );
3355

34-
$project = projects_utils::create_project( $post );
35-
url::redirect( $project->url );
36-
exit;
3756
} else {
3857

3958
$this->template->content = new View( 'projects/add' );
40-
$this->template->content->project_types = Projects_utils::get_poject_types_dropdown_array();
59+
$this->template->content->project_types = Projects_utils::get_project_types_dropdown_array();
60+
$this->template->content->user = $user;
4161
}
4262
}
4363

64+
65+
public function edit( $id ){
66+
67+
$user = Auth::instance()->get_user();
68+
69+
$project = ORM::factory( 'project', $id );
70+
if( ! $project->user_can( $user, 'edit' ) )
71+
return $this->template->content = 'oh, come on!';
72+
73+
if( $post = $this->input->post( 'project' ) ){
74+
75+
$validation = Projects_utils::projects_edit_validation( $post );
76+
77+
$project->validate( $validation, true );
78+
79+
url::redirect( $project->url );
80+
} else {
81+
$this->template->content = View::factory( 'projects/edit' )
82+
->bind( 'project_types', Projects_utils::get_project_types_dropdown_array() )
83+
->bind( 'project', $project )
84+
->bind( 'user', $user );
85+
}
86+
}
87+
88+
4489
}

‎modules/projects/libraries/Projects_utils.php

+36-29
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,37 @@
1-
<?php
2-
3-
class projects_utils{
4-
5-
6-
public static function get_poject_types_dropdown_array(){
7-
8-
$types = array();
9-
foreach( ORM::factory( 'project_type' )->find_all() as $type ) $types[ $type->id ] = $type->name;
10-
return $types;
11-
}
12-
13-
14-
public static function create_project( array $data ){
15-
16-
$project = ORM::factory( 'project' );
17-
18-
$validation = new Validation( $data );
19-
20-
$validation
21-
->add_rules( 'name', 'required' )
22-
->add_rules( 'project_type_id', 'required', 'numeric' );
23-
24-
25-
$project->validate( $validation, true );
26-
27-
return $project;
28-
}
29-
1+
<?php
2+
3+
class Projects_utils{
4+
5+
6+
public static function get_project_types_dropdown_array(){
7+
8+
$types = array();
9+
foreach( ORM::factory( 'project_type' )->find_all() as $type ) $types[ $type->id ] = $type->name;
10+
return $types;
11+
}
12+
13+
14+
public static function projects_add_validation( array $data ){
15+
16+
$validation = new Validation( $data );
17+
18+
$validation
19+
->add_rules( 'name', 'required' )
20+
->add_rules( 'project_type_id', 'required', 'numeric' );
21+
22+
return $validation;
23+
}
24+
25+
26+
public static function projects_edit_validation( array $data ){
27+
28+
$validation = new Validation( $data );
29+
30+
$validation
31+
->add_rules( 'name', 'required' )
32+
->add_rules( 'project_type_id', 'numeric', 'required' );
33+
34+
return $validation;
35+
}
36+
3037
}

‎modules/projects/models/project.php

+40-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
class Project_Model extends ORM{
44

55
protected $belongs_to = array( 'project_type' );
6-
protected $has_and_belongs_to_many = array( 'users', 'projects' );
6+
protected $has_and_belongs_to_many = array( 'users' );
77

88

99
public function __get( $prop ){
@@ -13,4 +13,43 @@ public function __get( $prop ){
1313

1414
return parent::__get( $prop );
1515
}
16+
17+
public function set_user_roles( array $roles ){
18+
19+
foreach( $roles as $user_key => $role )
20+
$this->add_user_role( $user_key, $role );
21+
}
22+
23+
24+
public function add_user_role( $user, $role_string ){
25+
26+
$user = ORM::factory( 'user', $user );
27+
$role = ORM::factory( 'project_user_role' );
28+
$role->user = $user;
29+
$role->project = $this;
30+
$role->role = $role_string;
31+
$role->save();
32+
}
33+
34+
public function user_can( $user, $action ){
35+
36+
if( 'edit' == $action )
37+
return $this->has_user( $user );
38+
}
39+
40+
41+
public function has_user( User_Model $user ){
42+
43+
return 1 == ORM::factory( 'project_user_role' )
44+
->where( 'project_id', $this->id )
45+
->where( 'user_id', $user->id )
46+
->count_all();
47+
}
48+
49+
50+
public function __toString(){
51+
52+
return $this->name;
53+
}
1654
}
55+

‎modules/projects/models/project_user_role.php

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?php
2+
3+
class Project_user_role_Model extends ORM{
4+
5+
protected $table_name = 'projects_users';
6+
protected $belongs_to = array( 'project', 'user' );
7+
protected $sorting = array( 'project_id' => 'asc' );
8+
9+
10+
public function __toString(){
11+
12+
return $this->role;
13+
}
14+
15+
16+
public function __set( $prop, $value ){
17+
18+
if( 'user' == $prop || 'project' == $prop ){
19+
$prop .= '_id';
20+
$value = $value->id;
21+
}
22+
return parent::__set( $prop, $value );
23+
}
24+
}

‎modules/projects/views/projects/add.php

+21
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<<<<<<< HEAD
12
<?php echo form::open( null, array( 'method' => 'post' ) ); ?>
23

34
<?php echo form::open_fieldset( array( 'class' => 'required-info' ) ); ?>
@@ -16,4 +17,24 @@
1617

1718
<?php echo form::submit( array( 'value' => 'Add' ) ); ?>
1819

20+
=======
21+
<?php echo form::open( null, array( 'method' => 'post' ) ); ?>
22+
23+
<?php echo form::open_fieldset( array( 'class' => 'required-info' ) ); ?>
24+
<?php echo form::legend( 'Required Info' ); ?>
25+
26+
<p><?php echo form::label( 'project[name]', 'Project Name' ),
27+
form::input( 'project[name]' ); ?></p>
28+
<p><?php echo form::label( 'project[project_type_id]', 'Project Type' ),
29+
form::dropdown( 'project[project_type_id]', $project_types ); ?></p>
30+
<p><?php echo form::label( 'user[role]', 'Your Role' ),
31+
form::input( 'user[role]' ); ?></p>
32+
33+
<?php echo form::close_fieldset(); ?>
34+
35+
36+
37+
<?php echo form::submit( array( 'value' => 'Add' ) ); ?>
38+
39+
>>>>>>> dcdc598e29af2737b5683ba0189beef31499a227
1940
<?php echo form::close(); ?>

‎modules/projects/views/projects/edit.php

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php echo form::open( null, array( 'method' => 'post' ) ); ?>
2+
3+
<?php echo form::open_fieldset( array( 'class' => 'required-info' ) ); ?>
4+
<?php echo form::legend( 'Required Info' ); ?>
5+
6+
<p><?php echo form::label( 'project[name]', 'Project Name' ),
7+
form::input( 'project[name]', $project->name ); ?></p>
8+
<p><?php echo form::label( 'project[project_type_id]', 'Project Type' ),
9+
form::dropdown( 'project[project_type_id]', $project_types, $project->project_type_id ); ?></p>
10+
<p><?php echo form::label( 'user[role]', 'Your Role' ),
11+
form::input( 'user[role]', $user->role_for_project( $project ) ); ?></p>
12+
13+
<?php echo form::close_fieldset(); ?>
14+
15+
<?php echo form::submit( array( 'value' => 'Save' ) ); ?>
16+
17+
<?php echo form::close(); ?>

‎modules/projects/views/projects/list.php

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?php foreach( $projects as $project ): ?>
2+
<div>
3+
<a href="<?php echo $project->url; ?>"><?php echo $project->name; ?></a><br />
4+
<?php $project_user_count = count( $project->users );
5+
echo $project_user_count, ' ' , inflector::plural( ' member', $project_user_count ) ?>
6+
</div>
7+
<?php endforeach; ?>
8+

‎modules/projects/views/projects/view.php

+9-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@
22

33
echo $project->name, '<br />';
44

5-
foreach( $project->users as $user ):
5+
foreach( $project->users as $member ):
66

7-
echo $user->email, '<br />',
8-
$user->role_for_project( $project );
9-
endforeach;
7+
echo $member->email, ' role: ', $member->role_for_project( $project ), '<br />';
8+
endforeach;
9+
10+
if( $project->user_can( $user, 'edit' ) ): ?>
11+
12+
<a href="<?php echo $project->url, '/edit'; ?>" >Edit</a>
13+
<?php endif;
14+

0 commit comments

Comments
 (0)