Merge branch 'dev'

Author: jbarrett

cpanfile

@@ -88,6 +88,7 @@ requires 'Plack::Middleware::Debug', '0.16';
 requires 'Prosody', '0.007';
 requires 'String::ProgressBar', '0.03';
 requires 'Test::WWW::Mechanize::Catalyst', '0.58';
+requires 'Test::EOL', '1.5';
 requires 'Text::VimColor', '0.20';
 requires 'Text::Fuzzy', '0.14';
 requires 'Text::CSV', '1.32';

lib/DDGC/Web/Controller/Forum/My.pm

@@ -80,7 +80,7 @@ sub thread : Chained('base') CaptureArgs(1) {
 		$c->response->redirect($c->chained_uri('Forum','general',{ thread_notfound => 1 }));
 		return $c->detach;
 	}
-	unless ($c->user->admin || $c->stash->{thread}->users_id == $c->user->id) {
+	unless ($c->user->is('forum_manager') || $c->stash->{thread}->users_id == $c->user->id) {
 		$c->response->redirect($c->chained_uri('Forum','general',{ thread_notallowed => 1 }));
 		return $c->detach;
 	}

lib/DDGC/Web/Controller/InstantAnswer.pm

@@ -123,28 +123,31 @@ sub ia_base :Chained('base') :PathPart('view') :CaptureArgs(1) {  # /ia/view/cal
 
     my $permissions;
     my $is_admin;
-    my $edit_class = "hide";
+    my $can_edit;
+    my $can_commit;
     my $commit_class = "hide";
 
     if ($c->user) {
         $permissions = $c->stash->{ia}->users->find($c->user->id);
         $is_admin = $c->user->admin;
-    }
 
-    if ($permissions || $is_admin) {
-        $edit_class = "";
+        if ($permissions || $is_admin) {
+            $can_edit = 1;
 
-        if ($is_admin) {
-            my $edits = get_edits($c->d, $c->stash->{ia}->name);
+            if ($is_admin) {
+                my $edits = get_edits($c->d, $c->stash->{ia}->name);
+                $can_commit = 1;
 
-            if (ref $edits eq 'ARRAY') {
-                $commit_class = "";
+                if (length $edits && ref $edits eq 'HASH') {
+                    $commit_class = '';
+                }
             }
         }
     }
 
     $c->stash->{title} = $c->stash->{ia}->name;
-    $c->stash->{edit_class} = $edit_class;
+    $c->stash->{can_edit} = $can_edit;
+    $c->stash->{can_commit} = $can_commit;
     $c->stash->{commit_class} = $commit_class;
 
     my @topics = $c->d->rs('Topic')->search(
@@ -165,9 +168,12 @@ sub ia_json :Chained('ia_base') :PathPart('json') :Args(0) {
 
     my $ia = $c->stash->{ia};
     my @topics = map { $_->name} $ia->topics;
-
-    my @issues = $c->d->rs('InstantAnswer::Issues')->find({instant_answer_id => $ia->id});
-    my @ia_issues; 
+    my $edited;
+    my @issues = $c->d->rs('InstantAnswer::Issues')->search({instant_answer_id => $ia->id});
+    my @ia_issues;
+    my %ia_data;
+    my $permissions;
+    my $is_admin; 
 
     for my $issue (@issues) {
         if ($issue) {
@@ -180,7 +186,9 @@ sub ia_json :Chained('ia_base') :PathPart('json') :Args(0) {
         }
     }
 
-    $c->stash->{x} =  {
+    my $other_queries = $ia->other_queries? decode_json($ia->other_queries) : undef;
+
+    $ia_data{live} =  {
                 id => $ia->id,
                 name => $ia->name,
                 description => $ia->description,
@@ -190,14 +198,33 @@ sub ia_json :Chained('ia_base') :PathPart('json') :Args(0) {
                 dev_milestone => $ia->dev_milestone,
                 perl_module => $ia->perl_module,
                 example_query => $ia->example_query,
-                other_queries => $ia->other_queries? decode_json($ia->other_queries) : undef,
+                other_queries => $other_queries,
                 code => $ia->code? decode_json($ia->code) : undef,
                 topic => \@topics,
                 attribution => $ia->attribution? decode_json($ia->attribution) : undef,
                 issues => \@ia_issues,
                 template => $ia->template,
     };
 
+    if ($c->user) {
+        $permissions = $c->stash->{ia}->users->find($c->user->id);
+        $is_admin = $c->user->admin;
+
+        if ($is_admin || $permissions) {
+            $edited = current_ia($c->d, $ia);
+            $ia_data{edited} = {
+                name => $edited->{name},
+                description => $edited->{description},
+                status => $edited->{status},
+                example_query => $edited->{example_query},
+                other_queries => $edited->{other_queries}->{value},
+                topic => $edited->{topic},
+            };
+        }
+    }
+
+    $c->stash->{x} = \%ia_data;
+
     $c->stash->{not_last_url} = 1;
     $c->forward($c->view('JSON'));
 }
@@ -307,16 +334,8 @@ sub commit_save :Chained('commit_base') :PathPart('save') :Args(0) {
                     }
                 }
             } 
-     
-            my $edits = get_edits($c->d, $ia->name);
 
-            if (ref $edits eq 'ARRAY') {
-                foreach my $edit (@{$edits}) {
-                    foreach my $field(keys %{$edit}){
-                        remove_edit($ia, $field);
-                    }
-                }
-            }
+            remove_edits($ia);
         }
     }
 
@@ -411,7 +430,7 @@ sub current_ia {
 sub add_edit {
     my ($ia, $field, $value ) = @_;
 
-    my $orig_data = $ia->get_column($field);
+    my $orig_data = $ia->get_column($field) || '';
     my $current_updates = $ia->get_column('updates') || ();
 
     if($value ne $orig_data){
@@ -448,10 +467,18 @@ sub remove_edit {
     my $column_updates = $ia->get_column('updates');
     my $edits = $column_updates? decode_json($column_updates) : undef;
     $edits->{$field} = undef;
- 
+                      
     $ia->update({updates => $edits});
 }
 
+# given a result set, remove 
+# all the entries from the updates column
+sub remove_edits {
+    my($ia) = @_;
+ 
+    $ia->update({updates => ''});
+}
+
 # given the IA name return the data in the updates
 # column as an array of hashes
 sub get_edits {

lib/DDGC/Web/Controller/Translate.pm

@@ -72,7 +72,7 @@ sub token :Chained('logged_in') :Args(1) {
 
 		for (keys %{$c->req->params}) {
 			if ($_ =~ m/token_notes_(\d+)_edit$/) {
-				my $token = $c->d->resultset('Token')->find({ id => $token_id });
+				my $token = $c->d->resultset('Token')->find($_);
 				$token->notes($c->req->params->{$_});
 				$token->update;
 			}
@@ -115,7 +115,7 @@ sub token :Chained('logged_in') :Args(1) {
 
 sub tokenlanguage :Chained('logged_in') :Args(1) {
 	my ( $self, $c, $token_language_id ) = @_;
-	$self->save_translate_params($c) if ($c->req->params->{save_translation});
+	$self->save_translate_params($c) if ($c->req->params->{save_translations});
 	if ($c->wiz_inside && $c->req->params->{wizard_skip}) {
 		push @{$c->wiz->unwanted_ids}, $token_language_id;
 		$c->wiz_step;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddg_community_platform",
-  "version": "0.53.0",
+  "version": "0.54.0",
   "engines": {
     "node": ">=0.10.0"
   },