Merge pull request #377 from dbarzin/dev

Dev

Author: dbarzin

app/Http/Controllers/MeasureController.php

@@ -462,8 +462,8 @@ public function plan(Request $request)
 
         // get all attributes
         $values = [];
-        $attributes = DB::table('measures')
-            ->select('attributes')
+        $attributes = DB::table('attributes')
+            ->select('values')
             ->get();
         foreach ($attributes as $attribute) {
             foreach (explode(' ', $attribute->attributes) as $value) {

resources/views/groups/show.blade.php

@@ -157,7 +157,7 @@
 	        </form>
 	        &nbsp;
 	        @endif
-            <a class="button" href="/users">
+			<a class="button" href="/groups">
 				<span class="mif-cancel"></span>
 				&nbsp;
 	    		{{ trans('common.cancel') }}